jeasx 1.6.2 → 1.7.0

package/cli.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import fs from "node:fs/promises";
-import env from "./env.js";
 
 switch (process.argv[2]) {
   case "start":
@@ -35,23 +34,13 @@ async function start() {
 }
 
 async function build() {
-  env();
-  const argv = [...process.argv];
-  process.argv = [];
-  await clean();
   await import("./esbuild.config.js");
-  process.argv = argv;
 }
 
 async function dev() {
   process.env.NODE_ENV = "development";
-  // Run build to prepare browser assets for fastify-static
   await build();
-  // Start the dev environment
-  process.argv[2] = "start";
-  process.argv[3] ??= "node_modules/jeasx/ecosystem.config.cjs";
-  // @ts-ignore
-  await import("pm2/bin/pm2-runtime");
+  await start();
 }
 
 async function clean() {

package/env.js

@@ -11,6 +11,11 @@ import { existsSync } from "node:fs";
  * 5. .env.<NODE_ENV>.local
  */
 export default function env() {
+  if (!process.loadEnvFile) {
+    console.warn("🌻 <node:process.loadEnvFile> is not available");
+    return;
+  }
+
   const files = [".env.defaults", ".env", ".env.local"];
 
   if (process.env.NODE_ENV) {
@@ -20,8 +25,11 @@ export default function env() {
     );
   }
 
-  files.filter(existsSync).forEach((file) => {
-    console.info(`🌻 Loading ${file}`);
-    process.loadEnvFile(file);
-  });
+  files
+    .toReversed()
+    .filter(existsSync)
+    .forEach((file) => {
+      console.info(`🌻 Loading ${file}`);
+      process.loadEnvFile(file);
+    });
 }

package/esbuild.config.js

@@ -1,4 +1,7 @@
 import * as esbuild from "esbuild";
+import env from "./env.js";
+
+env();
 
 const BUILD_TIME = `"${Date.now().toString(36)}"`;
 
@@ -16,53 +19,20 @@ const ESBUILD_BROWSER_TARGET = process.env.ESBUILD_BROWSER_TARGET
   ? process.env.ESBUILD_BROWSER_TARGET.replace(/\s/g, "").split(",")
   : ["chrome126", "edge126", "firefox128", "safari17"];
 
-const args = process.argv.slice(2);
-
-const builds = [];
-for (const arg of args.length ? args : ["routes", "js", "css"]) {
-  switch (arg) {
-    case "routes":
-      builds.push(
-        buildServer(
-          "src/routes/**/[*].js",
-          "src/routes/**/[*].ts",
-          "src/routes/**/[*].jsx",
-          "src/routes/**/[*].tsx"
-        )
-      );
-      break;
-    case "js":
-      builds.push(
-        buildBrowser(
-          "src/browser/**/index.js",
-          "src/browser/**/index.ts",
-          "src/browser/**/index.jsx",
-          "src/browser/**/index.tsx"
-        )
-      );
-      break;
-    case "css":
-      builds.push(buildBrowser("src/browser/**/index.css"));
-      break;
-    default:
-      console.info(`Error: Unknown argument '${arg}'.`);
-      process.exit(1);
-  }
-}
-
-await Promise.all(builds);
-
-/**
- * @param {string[]} entryPoints
- */
-function buildServer(...entryPoints) {
-  esbuild.build({
-    entryPoints,
+/** @type import("esbuild").BuildOptions[] */
+const buildOptions = [
+  {
+    entryPoints: ["js", "ts", "jsx", "tsx"].map(
+      (ext) => `src/routes/**/[*].${ext}`
+    ),
     define: {
       "process.env.BUILD_TIME": BUILD_TIME,
     },
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
+    logOverride: {
+      "empty-glob": "silent",
+    },
     color: true,
     bundle: true,
     sourcemap: true,
@@ -71,18 +41,17 @@ function buildServer(...entryPoints) {
     outdir: "dist",
     platform: "neutral",
     packages: "external",
-  });
-}
-
-/**
- * @param {string[]} entryPoints
- */
-function buildBrowser(...entryPoints) {
-  esbuild.build({
-    entryPoints,
+  },
+  {
+    entryPoints: ["js", "ts", "jsx", "tsx", "css"].map(
+      (ext) => `src/browser/**/index.${ext}`
+    ),
     define: BROWSER_PUBLIC_ENV,
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
+    logOverride: {
+      "empty-glob": "silent",
+    },
     color: true,
     bundle: true,
     sourcemap: true,
@@ -106,5 +75,13 @@ function buildBrowser(...entryPoints) {
       "*.woff",
       "*.woff2",
     ],
-  });
-}
+  },
+];
+
+buildOptions.forEach(async (options) => {
+  if (process.env.NODE_ENV === "development") {
+    (await esbuild.context(options)).watch();
+  } else {
+    await esbuild.build(options);
+  }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -28,11 +28,10 @@
     "@fastify/formbody": "8.0.2",
     "@fastify/multipart": "9.0.3",
     "@fastify/static": "8.1.1",
-    "@types/node": "22.13.10",
+    "@types/node": "22.13.14",
     "esbuild": "0.25.1",
-    "fastify": "5.2.1",
-    "jsx-async-runtime": "1.0.0",
-    "pm2": "6.0.5"
+    "fastify": "5.2.2",
+    "jsx-async-runtime": "1.0.0"
   },
   "scripts": {
     "build": "esbuild --platform=node --format=esm --outdir=. serverless.ts"

package/ecosystem.config.cjs

@@ -1,39 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: "jeasx:start:server",
-      script: "node_modules/jeasx/server.js",
-      watch: ["public"],
-      autorestart: true,
-    },
-    {
-      name: "jeasx:build:routes",
-      script: "node_modules/jeasx/esbuild.config.js",
-      args: "routes",
-      watch: ["js", "jsx", "ts", "tsx", "json"].map((ext) => `src/**/*.${ext}`),
-      ignore_watch: process.env.JEASX_BUILD_ROUTES_IGNORE_WATCH
-        ? process.env.JEASX_BUILD_ROUTES_IGNORE_WATCH.split(",")
-        : ["src/browser"],
-      autorestart: false,
-    },
-    {
-      name: "jeasx:build:js",
-      script: "node_modules/jeasx/esbuild.config.js",
-      args: "js",
-      watch: (process.env.JEASX_BUILD_JS_WATCH
-        ? process.env.JEASX_BUILD_JS_WATCH.split(",")
-        : ["src/browser"]
-      ).flatMap((path) =>
-        ["js", "jsx", "ts", "tsx", "json"].map((ext) => `${path}/**/*.${ext}`)
-      ),
-      autorestart: false,
-    },
-    {
-      name: "jeasx:build:css",
-      script: "node_modules/jeasx/esbuild.config.js",
-      args: "css",
-      watch: ["src/**/*.css"],
-      autorestart: false,
-    },
-  ],
-};