jeasx 0.3.3 → 0.3.5

package/cli.js

@@ -41,15 +41,18 @@ async function build() {
 
 async function dev() {
   process.env.NODE_ENV = "development";
+  // Run build to prepare browser assets for fastify-static
+  process.argv = ["jeasx", "build"];
+  await build();
+  // Start the dev environment
   process.argv[2] = "start";
   process.argv[3] ??= "node_modules/jeasx/ecosystem.config.cjs";
-  await clean();
   // @ts-ignore
   await import("pm2/bin/pm2-runtime");
 }
 
 async function clean() {
-  await fs.rm("dist", { recursive: true, force: true });
+  await fs.rm("dist", { recursive: true, force: true, maxRetries: 3 });
 }
 
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -30,8 +30,8 @@
     "@fastify/request-context": "5.1.0",
     "@fastify/static": "7.0.1",
     "@fastify/url-data": "5.4.0",
-    "@types/node": "20.11.17",
-    "dotenv": "16.4.3",
+    "@types/node": "20.11.19",
+    "dotenv": "16.4.4",
     "esbuild": "0.20.0",
     "fastify": "4.26.1",
     "jsx-async-runtime": "0.1.3",

package/serverless.js

@@ -1 +1 @@
-import fastifyAccepts from"@fastify/accepts";import fastifyCookie from"@fastify/cookie";import fastifyFormbody from"@fastify/formbody";import fastifyMultipart from"@fastify/multipart";import fastifyRequestContext from"@fastify/request-context";import fastifyStatic from"@fastify/static";import fastifyUrlData from"@fastify/url-data";import"dotenv/config";import Fastify from"fastify";import{renderToString}from"jsx-async-runtime";import{createHash}from"node:crypto";import{readFile,stat}from"node:fs/promises";import{join}from"node:path";const NODE_ENV_IS_DEVELOPMENT=process.env.NODE_ENV==="development";const serverless=Fastify({logger:true,disableRequestLogging:NODE_ENV_IS_DEVELOPMENT,bodyLimit:Number(process.env.FASTIFY_BODY_LIMIT)||void 0});serverless.register(fastifyAccepts);serverless.register(fastifyCookie);serverless.register(fastifyFormbody);serverless.register(fastifyMultipart);serverless.register(fastifyRequestContext);serverless.register(fastifyUrlData);const FASTIFY_STATIC_HEADERS=!NODE_ENV_IS_DEVELOPMENT&&process.env.FASTIFY_STATIC_HEADERS?JSON.parse(String(process.env.FASTIFY_STATIC_HEADERS)):void 0;serverless.register(fastifyStatic,{root:["public","dist/browser"].map(dir=>join(process.cwd(),dir)),prefix:"/",wildcard:false,setHeaders:FASTIFY_STATIC_HEADERS?(reply,path)=>{for(const[suffix,headers]of Object.entries(FASTIFY_STATIC_HEADERS)){if(path.endsWith(suffix)){for(const[key,value]of Object.entries(headers)){reply.setHeader(key,value)}return}}}:void 0});serverless.all("*",async(request,reply)=>{let response;const requestPath=request.urlData().path;const pathSegments=requestPath.split("/").filter(segment=>segment!=="").reduce((acc,segment)=>{acc.push((acc.length>0?acc[acc.length-1]:"")+"/"+segment);return acc},[]).reverse().concat("");const generateEdges=path=>{const edges=[];if(path){const lastSegment=path.lastIndexOf("/")+1;edges.push(`${path.substring(0,lastSegment)}[${path.substring(lastSegment)}]`)}edges.push(`${path}/[index]`);return edges};for(const pathname of[...pathSegments.slice().reverse().map(segment=>`routes${segment}/[...guard].js`),...generateEdges(pathSegments[0]).map(segment=>`routes${segment}.js`),...pathSegments.map(segment=>`routes${segment}/[...path].js`),...pathSegments.map(segment=>`routes${segment}/[404].js`)]){const modulePath=join(process.cwd(),"dist",pathname);try{(await stat(modulePath)).isFile()}catch{continue}const hash=NODE_ENV_IS_DEVELOPMENT?"?"+createHash("sha1").update(await readFile(modulePath,"utf-8")).digest("hex"):"";response=await(await import(`${modulePath}${hash}`)).default({request,reply,...typeof response==="object"?response:{}});if(reply.sent){return}else if(pathname.endsWith("/[...guard].js")&&(response===void 0||!isJSX(response))){continue}else if(pathname.endsWith("/[404].js")){reply.status(404);break}else if(reply.statusCode===404){continue}else{break}}if(!reply.hasHeader("Content-Type")){reply.header("Content-Type","text/html; charset=utf-8")}if(isJSX(response)){return await renderToString(response)}else{return response}function isJSX(obj){return typeof obj==="object"&&"type"in obj&&"props"in obj}});var serverless_default=serverless;export{serverless_default as default};
+import fastifyAccepts from"@fastify/accepts";import fastifyCookie from"@fastify/cookie";import fastifyFormbody from"@fastify/formbody";import fastifyMultipart from"@fastify/multipart";import fastifyRequestContext from"@fastify/request-context";import fastifyStatic from"@fastify/static";import fastifyUrlData from"@fastify/url-data";import"dotenv/config";import Fastify from"fastify";import{renderToString}from"jsx-async-runtime";import{createHash}from"node:crypto";import{readFile,stat}from"node:fs/promises";import{join}from"node:path";const NODE_ENV_IS_DEVELOPMENT=process.env.NODE_ENV==="development";const serverless=Fastify({logger:true,disableRequestLogging:NODE_ENV_IS_DEVELOPMENT,bodyLimit:Number(process.env.FASTIFY_BODY_LIMIT)||void 0});serverless.register(fastifyAccepts);serverless.register(fastifyCookie);serverless.register(fastifyFormbody);serverless.register(fastifyMultipart);serverless.register(fastifyRequestContext);serverless.register(fastifyUrlData);const FASTIFY_STATIC_HEADERS=!NODE_ENV_IS_DEVELOPMENT&&process.env.FASTIFY_STATIC_HEADERS?JSON.parse(String(process.env.FASTIFY_STATIC_HEADERS)):void 0;serverless.register(fastifyStatic,{root:["public","dist/browser"].map(dir=>join(process.cwd(),dir)),prefix:"/",wildcard:false,setHeaders:FASTIFY_STATIC_HEADERS?(reply,path)=>{for(const[suffix,headers]of Object.entries(FASTIFY_STATIC_HEADERS)){if(path.endsWith(suffix)){for(const[key,value]of Object.entries(headers)){reply.setHeader(key,value)}return}}}:void 0});serverless.all("*",async(request,reply)=>{let response;const requestPath=request.urlData().path;const pathSegments=requestPath.split("/").filter(segment=>segment!=="").reduce((acc,segment)=>{acc.push((acc.length>0?acc[acc.length-1]:"")+"/"+segment);return acc},[]).reverse().concat("");const generateEdges=path=>{const edges=[];if(path){const lastSegment=path.lastIndexOf("/")+1;edges.push(`${path.substring(0,lastSegment)}[${path.substring(lastSegment)}]`)}edges.push(`${path}/[index]`);return edges};for(const pathname of[...pathSegments.slice().reverse().map(segment=>`routes${segment}/[...guard].js`),...generateEdges(pathSegments[0]).map(segment=>`routes${segment}.js`),...pathSegments.map(segment=>`routes${segment}/[...path].js`),...pathSegments.map(segment=>`routes${segment}/[404].js`)]){const modulePath=join(process.cwd(),"dist",pathname);try{(await stat(modulePath)).isFile()}catch{continue}const hash=NODE_ENV_IS_DEVELOPMENT?"?"+createHash("sha1").update(await readFile(modulePath,"utf-8")).digest("hex"):"";response=await(await import(`file://${modulePath}${hash}`)).default({request,reply,...typeof response==="object"?response:{}});if(reply.sent){return}else if(pathname.endsWith("/[...guard].js")&&(response===void 0||!isJSX(response))){continue}else if(pathname.endsWith("/[404].js")){reply.status(404);break}else if(reply.statusCode===404){continue}else{break}}if(!reply.hasHeader("Content-Type")){reply.header("Content-Type","text/html; charset=utf-8")}if(isJSX(response)){return await renderToString(response)}else{return response}function isJSX(obj){return typeof obj==="object"&&"type"in obj&&"props"in obj}});var serverless_default=serverless;export{serverless_default as default};

package/serverless.ts

@@ -114,7 +114,7 @@ serverless.all("*", async (request, reply) => {
 
     // Call the handler with request, reply and optional props
     response = await (
-      await import(`${modulePath}${hash}`)
+      await import(`file://${modulePath}${hash}`)
     ).default({
       request,
       reply,