jeasx 2.3.2 → 2.4.1

package/CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## 2026-03-02 - Jeasx 2.4.1 released
+
+🎉 This release introduces route prop inheritance from guards. Guards can return objects whose entries are used as additional props for your routes. Previously, only props from the closest guard were used. With this update, props from all guards along the route are collected and passed down. If multiple guards provide props with the same key, the value from the guard nearest to the route takes precedence and overwrites earlier ones.
+
+Dependency updates: `@types/node@25.3.3`
+
+## 2026-02-20 - Jeasx 2.4.0 released
+
+🎉 This release is both a step forward and a step back: the recently introduced support for MDX has been removed from the core project. Jeasx aims to keep its core as lean as possible, so this change aligns with the project's overall goals. Since MDX is not essential for every Jeasx website or application, it makes sense to move it out of the core.
+
+Another key goal of Jeasx is to empower users to implement their own custom solutions in userland, providing the right tools to do so. In short, while MDX remains a fantastic technology for content-driven websites, Jeasx now lets you configure MDX support yourself through a much improved configuration system for its base technologies like esbuild and Fastify.
+
+For esbuild, two new configuration options are available: `ESBUILD_SERVER_OPTIONS` and `ESBUILD_BROWSER_OPTIONS`. These can be defined as functions in `.env.js` that return additional configuration settings for esbuild.
+
+Why use functions instead of plain objects for the configuration? Because using functions allows configurations to be created lazily - only when needed - which is especially helpful for more complex setups over time.
+
+If you want to use MDX with Jeasx, simply run `npm install @mdx-js/esbuild` and add the configuration below to `ESBUILD_SERVER_OPTIONS` in `.env.js`.
+
+If you've used `ESBUILD_BROWSER_TARGET` in the past, you have to move this configuration to `ESBUILD_BROWSER_OPTIONS` as shown below.
+
+```jsx
+import mdx from "@mdx-js/esbuild";
+
+export default {
+  /** @type {() => import("esbuild").BuildOptions} */
+  ESBUILD_SERVER_OPTIONS: () => ({
+    plugins: [
+      mdx({
+        development: process.env.NODE_ENV === "development",
+        jsxImportSource: "jsx-async-runtime",
+        elementAttributeNameCase: "html",
+        stylePropertyNameCase: "css"
+      })
+    ]
+  }),
+
+  /** @type {() => import("esbuild").BuildOptions} */
+  ESBUILD_BROWSER_OPTIONS: () => ({
+    target: ["chrome130", "edge130", "firefox130", "safari18"]
+  })
+}
+```
+
+The existing configuration options for Fastify (such as `FASTIFY_SERVER_OPTIONS`, `FASTIFY_COOKIE_OPTIONS`, `FASTIFY_MULTIPART_OPTIONS`, `FASTIFY_STATIC_OPTIONS`) now require a minor change: they must be defined as functions instead of plain objects.
+
+Additionally, you can now customize the fastify server instance using the optional `FASTIFY_SERVER` function. This function receives the created server instance and should return the modified version. This feature is especially useful when integrating existing Fastify plugins like `@fastify/compress`, as demonstrated below.
+
+```jsx
+import fastifyCompress from "@fastify/compress";
+
+const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
+
+export default {
+  /** @type {(fastify: import("fastify").FastifyInstance) => import("fastify").FastifyInstance} */
+  FASTIFY_SERVER: (fastify) => fastify.register(fastifyCompress),
+
+  /** @type {() => import("fastify").FastifyServerOptions} */
+  FASTIFY_SERVER_OPTIONS: () => ({
+    disableRequestLogging: NODE_ENV_IS_DEVELOPMENT,
+    bodyLimit: 1024 * 1024
+  }),
+
+  /** @type {() => import("@fastify/static").FastifyStaticOptions} */
+  FASTIFY_STATIC_OPTIONS: () => ({
+    immutable: !NODE_ENV_IS_DEVELOPMENT,
+    maxAge: NODE_ENV_IS_DEVELOPMENT ? 0 : "365d"
+  })
+};
+```
+
+Another notable change is that the fallback content-type (`text/html`) for routes is now set as late as possible. This means you can return plain JavaScript objects from routes, which will be automatically sent as `application/json` by default - without needing to explicitly specify the content-type in your code. This update brings Jeasx in line with Fastify’s default behavior.
+
+Additionally, you can now define routes directly from simple `*.json` or `*.txt` files - perfect for creating static endpoints like a health check or a `robots.txt` file right in your routes folder.
+
+Dependency updates: `@types/node@25.3.0`
+
 ## 2026-02-12 - Jeasx 2.3.2 released
 
 🎉 Upgraded to @types/node@25, enabling seamless development with Node 25 while maintaining compatibility for Node 24 users.

package/env.js

@@ -31,7 +31,17 @@ export default async function env() {
     const envObject = (await import(envFile)).default;
     Object.entries(envObject).forEach(([key, value]) => {
       try {
-        process.env[key] = typeof value === "string" ? value : JSON.stringify(value);
+        switch (typeof value) {
+          case "string":
+            process.env[key] = value;
+            break;
+          case "function":
+            process.env[key] = value.toString();
+            break;
+          default:
+            process.env[key] = JSON.stringify(value);
+            break;
+        }
       } catch (error) {
         // JSON.stringify throws TypeError for circular references or BigInts.
         console.error("❌", `"${key}" in .env.js throws`, error);

package/esbuild.config.js

@@ -1,4 +1,3 @@
-import mdx from "@mdx-js/esbuild";
 import * as esbuild from "esbuild";
 import env from "./env.js";
 
@@ -16,33 +15,15 @@ const BROWSER_PUBLIC_ENV = Object.keys(ENV)
     { "process.env.BROWSER_PUBLIC_BUILD_TIME": BUILD_TIME },
   );
 
-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", "mdx"].map((ext) => `src/**/[*].${ext}`),
+    entryPoints: ["src/**/[*].*"],
     define: {
       "process.env.BUILD_TIME": BUILD_TIME,
     },
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
-    logOverride: {
-      "empty-glob": "silent",
-    },
     color: true,
     bundle: true,
     sourcemap: process.sourceMapsEnabled,
@@ -50,16 +31,13 @@ const buildOptions = [
     outdir: "dist/server",
     platform: "neutral",
     packages: "external",
-    plugins: [ESBUILD_MDX_PLUGIN],
+    ...ENV.ESBUILD_SERVER_OPTIONS?.(),
   },
   {
-    entryPoints: ["js", "ts", "jsx", "tsx", "css"].map((ext) => `src/**/index.${ext}`),
+    entryPoints: ["src/**/index.*"],
     define: BROWSER_PUBLIC_ENV,
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
-    logOverride: {
-      "empty-glob": "silent",
-    },
     color: true,
     bundle: true,
     sourcemap: process.sourceMapsEnabled,
@@ -67,7 +45,7 @@ const buildOptions = [
     outdir: "dist/browser",
     platform: "browser",
     format: "esm",
-    target: ESBUILD_BROWSER_TARGET,
+    target: ["chrome130", "edge130", "firefox130", "safari18"],
     external: [
       "*.avif",
       "*.gif",
@@ -82,7 +60,7 @@ const buildOptions = [
       "*.woff",
       "*.woff2",
     ],
-    plugins: [ESBUILD_MDX_PLUGIN],
+    ...ENV.ESBUILD_BROWSER_OPTIONS?.(),
   },
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "description": "Jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "fastify",
@@ -31,8 +31,7 @@
     "@fastify/formbody": "8.0.2",
     "@fastify/multipart": "9.4.0",
     "@fastify/static": "9.0.0",
-    "@mdx-js/esbuild": "3.1.1",
-    "@types/node": "25.2.3",
+    "@types/node": "25.3.3",
     "esbuild": "0.27.3",
     "fastify": "5.7.4",
     "jsx-async-runtime": "2.0.2"

package/serverless.js

@@ -2,7 +2,7 @@ import fastifyCookie from "@fastify/cookie";
 import fastifyFormbody from "@fastify/formbody";
 import fastifyMultipart from "@fastify/multipart";
 import fastifyStatic from "@fastify/static";
-import Fastify from "fastify";
+import fastify from "fastify";
 import { jsxToString } from "jsx-async-runtime";
 import { stat } from "node:fs/promises";
 import { freemem } from "node:os";
@@ -12,38 +12,46 @@ 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,
-  ...ENV.FASTIFY_SERVER_OPTIONS
-}).register(fastifyCookie, {
-  ...ENV.FASTIFY_COOKIE_OPTIONS
-}).register(fastifyFormbody, {
-  ...ENV.FASTIFY_FORMBODY_OPTIONS
-}).register(fastifyMultipart, {
-  attachFieldsToBody: "keyValues",
-  ...ENV.FASTIFY_MULTIPART_OPTIONS
-}).register(fastifyStatic, {
-  root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
-  prefix: "/",
-  wildcard: false,
-  preCompressed: true,
-  ...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("?");
-  request.path = index === -1 ? request.url : request.url.slice(0, index);
-}).all("*", async (request, reply) => {
-  try {
-    return await handler(request, reply);
-  } catch (error) {
-    console.error("\u274C", error);
-    throw error;
-  }
+const FASTIFY_SERVER = ENV.FASTIFY_SERVER ?? ((fastify2) => fastify2);
+var serverless_default = FASTIFY_SERVER(
+  fastify({
+    logger: true,
+    ...ENV.FASTIFY_SERVER_OPTIONS?.()
+  })
+).register((fastify2) => {
+  fastify2.register(fastifyCookie, {
+    ...ENV.FASTIFY_COOKIE_OPTIONS?.()
+  }).register(fastifyFormbody, {
+    ...ENV.FASTIFY_FORMBODY_OPTIONS?.()
+  }).register(fastifyMultipart, {
+    attachFieldsToBody: "keyValues",
+    ...ENV.FASTIFY_MULTIPART_OPTIONS?.()
+  }).register(fastifyStatic, {
+    root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
+    prefix: "/",
+    wildcard: false,
+    ...ENV.FASTIFY_STATIC_OPTIONS?.()
+  }).decorateRequest("route", "").decorateRequest("path", "").addHook("onRequest", async (request) => {
+    const index = request.url.indexOf("?");
+    request.path = index === -1 ? request.url : request.url.slice(0, index);
+  }).all("*", async (request, reply) => {
+    try {
+      const payload = await handler(request, reply);
+      if (reply.getHeader("content-type") === void 0 && (typeof payload === "string" || Buffer.isBuffer(payload))) {
+        reply.type("text/html; charset=utf-8");
+      }
+      return payload;
+    } catch (error) {
+      console.error("\u274C", error);
+      throw error;
+    }
+  });
 });
 const modules = /* @__PURE__ */ new Map();
 async function handler(request, reply) {
   let response;
   const context = {};
+  const props = { request, reply };
   try {
     for (const route of generateRoutes(request.path)) {
       let module = modules.get(route);
@@ -79,11 +87,8 @@ async function handler(request, reply) {
         }
       }
       request.route = route;
-      response = await module.default.call(context, {
-        request,
-        reply,
-        ...typeof response === "object" ? response : {}
-      });
+      response = // Call functions with 'this' context and props as parameters
+      typeof module.default === "function" ? await module.default.call(context, props) : module.default;
       if (reply.sent) {
         return;
       } else if (route.endsWith("/[404]")) {
@@ -94,6 +99,7 @@ async function handler(request, reply) {
       } else if (typeof response === "string" || Buffer.isBuffer(response) || isJSX(response)) {
         break;
       } else if (route.endsWith("/[...guard]") && (response === void 0 || typeof response === "object")) {
+        Object.assign(props, response);
         continue;
       } else if (reply.statusCode === 404) {
         continue;

package/serverless.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["serverless.ts"],
-  "mappings": "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",
-  "names": []
+  "mappings": "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",
+  "names": ["fastify"]
 }

package/serverless.ts

@@ -2,7 +2,12 @@ import fastifyCookie, { FastifyCookieOptions } from "@fastify/cookie";
 import fastifyFormbody, { FastifyFormbodyOptions } from "@fastify/formbody";
 import fastifyMultipart, { FastifyMultipartOptions } from "@fastify/multipart";
 import fastifyStatic, { FastifyStaticOptions } from "@fastify/static";
-import Fastify, { FastifyReply, FastifyRequest, FastifyServerOptions } from "fastify";
+import fastify, {
+  FastifyInstance,
+  FastifyReply,
+  FastifyRequest,
+  FastifyServerOptions,
+} from "fastify";
 import { jsxToString } from "jsx-async-runtime";
 import { stat } from "node:fs/promises";
 import { freemem } from "node:os";
@@ -22,44 +27,59 @@ declare module "fastify" {
   }
 }
 
-// Create and export a Fastify app instance
-export default Fastify({
-  logger: true,
-  ...(ENV.FASTIFY_SERVER_OPTIONS as FastifyServerOptions),
-})
-  .register(fastifyCookie, {
-    ...(ENV.FASTIFY_COOKIE_OPTIONS as FastifyCookieOptions),
-  })
-  .register(fastifyFormbody, {
-    ...(ENV.FASTIFY_FORMBODY_OPTIONS as FastifyFormbodyOptions),
-  })
-  .register(fastifyMultipart, {
-    attachFieldsToBody: "keyValues",
-    ...(ENV.FASTIFY_MULTIPART_OPTIONS as FastifyMultipartOptions),
-  })
-  .register(fastifyStatic, {
-    root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
-    prefix: "/",
-    wildcard: false,
-    preCompressed: true,
-    ...(ENV.FASTIFY_STATIC_OPTIONS as FastifyStaticOptions),
-  })
-  .decorateRequest("route", "")
-  .decorateRequest("path", "")
-  .addHook("onRequest", async (request, reply) => {
-    // Set default content type to text/html
-    reply.header("Content-Type", "text/html; charset=utf-8");
-    // Extract path from url
-    const index = request.url.indexOf("?");
-    request.path = index === -1 ? request.url : request.url.slice(0, index);
-  })
-  .all("*", async (request: FastifyRequest, reply: FastifyReply) => {
-    try {
-      return await handler(request, reply);
-    } catch (error) {
-      console.error("❌", error);
-      throw error;
-    }
+// Enhance Fastify server from userland
+const FASTIFY_SERVER = (ENV.FASTIFY_SERVER ?? ((fastify) => fastify)) as (
+  fastify: FastifyInstance,
+) => FastifyInstance;
+
+// Create and export a Fastify instance
+export default FASTIFY_SERVER(
+  fastify({
+    logger: true,
+    ...(ENV.FASTIFY_SERVER_OPTIONS?.() as FastifyServerOptions),
+  }),
+)
+  // Create encapsulation context
+  .register((fastify) => {
+    fastify
+      .register(fastifyCookie, {
+        ...(ENV.FASTIFY_COOKIE_OPTIONS?.() as FastifyCookieOptions),
+      })
+      .register(fastifyFormbody, {
+        ...(ENV.FASTIFY_FORMBODY_OPTIONS?.() as FastifyFormbodyOptions),
+      })
+      .register(fastifyMultipart, {
+        attachFieldsToBody: "keyValues",
+        ...(ENV.FASTIFY_MULTIPART_OPTIONS?.() as FastifyMultipartOptions),
+      })
+      .register(fastifyStatic, {
+        root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
+        prefix: "/",
+        wildcard: false,
+        ...(ENV.FASTIFY_STATIC_OPTIONS?.() as FastifyStaticOptions),
+      })
+      .decorateRequest("route", "")
+      .decorateRequest("path", "")
+      .addHook("onRequest", async (request) => {
+        // Extract path from url
+        const index = request.url.indexOf("?");
+        request.path = index === -1 ? request.url : request.url.slice(0, index);
+      })
+      .all("*", async (request: FastifyRequest, reply: FastifyReply) => {
+        try {
+          const payload = await handler(request, reply);
+          if (
+            reply.getHeader("content-type") === undefined &&
+            (typeof payload === "string" || Buffer.isBuffer(payload))
+          ) {
+            reply.type("text/html; charset=utf-8");
+          }
+          return payload;
+        } catch (error) {
+          console.error("❌", error);
+          throw error;
+        }
+      });
   });
 
 // Cache for resolved route modules, 'null' means no module exists.
@@ -74,6 +94,9 @@ async function handler(request: FastifyRequest, reply: FastifyReply) {
   // Global context object for route handlers
   const context = {};
 
+  // Default props for route handlers
+  const props = { request, reply };
+
   try {
     // Execute route handlers for current request
     for (const route of generateRoutes(request.path)) {
@@ -124,12 +147,11 @@ async function handler(request: FastifyRequest, reply: FastifyReply) {
       // Store current route in request
       request.route = route;
 
-      // Call the handler with request, reply and optional props
-      response = await module.default.call(context, {
-        request,
-        reply,
-        ...(typeof response === "object" ? response : {}),
-      });
+      response =
+        // Call functions with 'this' context and props as parameters
+        typeof module.default === "function"
+          ? await module.default.call(context, props)
+          : module.default; // otherwise return default export
 
       if (reply.sent) {
         return;
@@ -146,6 +168,8 @@ async function handler(request: FastifyRequest, reply: FastifyReply) {
         route.endsWith("/[...guard]") &&
         (response === undefined || typeof response === "object")
       ) {
+        // Add object entries from guard to props
+        Object.assign(props, response);
         continue;
       } else if (reply.statusCode === 404) {
         continue;