jeasx 1.5.0 → 1.6.2

package/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import fs from "node:fs/promises";
+import env from "./env.js";
 
 switch (process.argv[2]) {
   case "start":
@@ -34,6 +35,7 @@ async function start() {
 }
 
 async function build() {
+  env();
   const argv = [...process.argv];
   process.argv = [];
   await clean();

package/ecosystem.config.cjs

@@ -1,5 +1,3 @@
-require("dotenv-flow/config");
-
 module.exports = {
   apps: [
     {

package/env.js

@@ -0,0 +1,27 @@
+import { existsSync } from "node:fs";
+
+/**
+ * Load environment variables from .env* files
+ * into process.env in the following order:
+ *
+ * 1. .env.defaults
+ * 2. .env
+ * 3. .env.local
+ * 4. .env.<NODE_ENV>
+ * 5. .env.<NODE_ENV>.local
+ */
+export default function env() {
+  const files = [".env.defaults", ".env", ".env.local"];
+
+  if (process.env.NODE_ENV) {
+    files.push(
+      `.env.${process.env.NODE_ENV}`,
+      `.env.${process.env.NODE_ENV}.local`
+    );
+  }
+
+  files.filter(existsSync).forEach((file) => {
+    console.info(`🌻 Loading ${file}`);
+    process.loadEnvFile(file);
+  });
+}

package/esbuild.config.js

@@ -1,4 +1,3 @@
-import "dotenv-flow/config";
 import * as esbuild from "esbuild";
 
 const BUILD_TIME = `"${Date.now().toString(36)}"`;
@@ -66,6 +65,8 @@ function buildServer(...entryPoints) {
     logLevel: "info",
     color: true,
     bundle: true,
+    sourcemap: true,
+    sourcesContent: false,
     outbase: "src",
     outdir: "dist",
     platform: "neutral",
@@ -84,6 +85,8 @@ function buildBrowser(...entryPoints) {
     logLevel: "info",
     color: true,
     bundle: true,
+    sourcemap: true,
+    sourcesContent: true,
     outbase: "src/browser",
     outdir: "dist/browser",
     platform: "browser",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "description": "Jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -29,11 +29,10 @@
     "@fastify/multipart": "9.0.3",
     "@fastify/static": "8.1.1",
     "@types/node": "22.13.10",
-    "dotenv-flow": "4.1.0",
-    "esbuild": "0.25.0",
+    "esbuild": "0.25.1",
     "fastify": "5.2.1",
-    "jsx-async-runtime": "0.8.1",
-    "pm2": "5.4.3"
+    "jsx-async-runtime": "1.0.0",
+    "pm2": "6.0.5"
   },
   "scripts": {
     "build": "esbuild --platform=node --format=esm --outdir=. serverless.ts"

package/serverless.js

@@ -2,20 +2,23 @@ import fastifyCookie from "@fastify/cookie";
 import fastifyFormbody from "@fastify/formbody";
 import fastifyMultipart from "@fastify/multipart";
 import fastifyStatic from "@fastify/static";
-import "dotenv-flow/config";
 import Fastify from "fastify";
 import { jsxToString } from "jsx-async-runtime";
 import { createHash } from "node:crypto";
 import { readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
+import env from "./env.js";
+env();
 const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
 const CWD = process.cwd();
 const FASTIFY_STATIC_HEADERS = process.env.FASTIFY_STATIC_HEADERS && JSON.parse(process.env.FASTIFY_STATIC_HEADERS);
 var serverless_default = Fastify({
   logger: true,
-  disableRequestLogging: Boolean(process.env.FASTIFY_DISABLE_REQUEST_LOGGING),
+  disableRequestLogging: JSON.parse(
+    process.env.FASTIFY_DISABLE_REQUEST_LOGGING || "false"
+  ),
   bodyLimit: Number(process.env.FASTIFY_BODY_LIMIT) || void 0,
-  trustProxy: Boolean(process.env.FASTIFY_TRUST_PROXY),
+  trustProxy: JSON.parse(process.env.FASTIFY_TRUST_PROXY || "false"),
   rewriteUrl: process.env.FASTIFY_REWRITE_URL && new Function(`return ${process.env.FASTIFY_REWRITE_URL}`)()
 }).register(fastifyCookie).register(fastifyFormbody).register(fastifyMultipart).register(fastifyStatic, {
   root: ["public", "dist/browser"].map((dir) => join(CWD, dir)),
@@ -37,7 +40,14 @@ var serverless_default = Fastify({
 }).decorateRequest("route", "").decorateRequest("path", "").addHook("onRequest", async (request, reply) => {
   const index = request.url.indexOf("?");
   request.path = index === -1 ? request.url : request.url.slice(0, index);
-}).all("*", handler);
+}).all("*", async (request, reply) => {
+  try {
+    return await handler(request, reply);
+  } catch (error) {
+    console.error("\u274C", error);
+    throw error;
+  }
+});
 const modules = {};
 async function handler(request, reply) {
   let response;

package/serverless.ts

@@ -2,12 +2,14 @@ import fastifyCookie from "@fastify/cookie";
 import fastifyFormbody from "@fastify/formbody";
 import fastifyMultipart from "@fastify/multipart";
 import fastifyStatic from "@fastify/static";
-import "dotenv-flow/config";
 import Fastify, { FastifyReply, FastifyRequest } from "fastify";
 import { jsxToString } from "jsx-async-runtime";
 import { createHash } from "node:crypto";
 import { readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
+import env from "./env.js";
+
+env();
 
 const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
 const CWD = process.cwd();
@@ -26,9 +28,11 @@ declare module "fastify" {
 // Create and export a Fastify app instance
 export default Fastify({
   logger: true,
-  disableRequestLogging: Boolean(process.env.FASTIFY_DISABLE_REQUEST_LOGGING),
+  disableRequestLogging: JSON.parse(
+    process.env.FASTIFY_DISABLE_REQUEST_LOGGING || "false"
+  ),
   bodyLimit: Number(process.env.FASTIFY_BODY_LIMIT) || undefined,
-  trustProxy: Boolean(process.env.FASTIFY_TRUST_PROXY),
+  trustProxy: JSON.parse(process.env.FASTIFY_TRUST_PROXY || "false"),
   rewriteUrl:
     process.env.FASTIFY_REWRITE_URL &&
     new Function(`return ${process.env.FASTIFY_REWRITE_URL}`)(),
@@ -62,7 +66,14 @@ export default Fastify({
     const index = request.url.indexOf("?");
     request.path = index === -1 ? request.url : request.url.slice(0, index);
   })
-  .all("*", handler);
+  .all("*", async (request: FastifyRequest, reply: FastifyReply) => {
+    try {
+      return await handler(request, reply);
+    } catch (error) {
+      console.error("❌", error);
+      throw error;
+    }
+  });
 
 // Cache for resolved route modules, 'null' means no module exists.
 const modules: { [path: string]: { default: Function } | null } = {};