chore: wip

Author: chrisbbreuer

routes/api.ts

@@ -1,5 +1,4 @@
 import { route } from '@stacksjs/router'
-// const { route } = await import('@stacksjs/router')
 
 /**
  * This file is the entry point for your application's API routes.

storage/framework/core/router/src/server.ts

@@ -51,10 +51,9 @@ export async function serverResponse(req: Request, body: string) {
   // This automatically allows for route definitions, like
   // '/about' and '/about/' to be treated as the same
   const trimmedUrl = req.url.endsWith('/') && req.url.length > 1 ? req.url.slice(0, -1) : req.url
-
   const url = new URL(trimmedUrl)
-
   const routesList: Route[] = await route.getRoutes()
+
   log.info(`Routes List: ${JSON.stringify(routesList)}`, { styled: false })
   log.info(`URL: ${JSON.stringify(url)}`, { styled: false })
 
@@ -145,7 +144,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
 
     const { status, ...payloadWithoutStatus } = middlewarePayload
 
-    return await new Response(JSON.stringify(payloadWithoutStatus), {
+    return new Response(JSON.stringify(payloadWithoutStatus), {
       headers: {
         'Content-Type': 'json',
         'Access-Control-Allow-Origin': '*',
@@ -161,7 +160,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     const callback = String(foundCallback)
     const response = Response.redirect(callback, statusCode)
 
-    return await noCache(response)
+    return noCache(response)
   }
 
   if (foundRoute?.method !== req.method) {
@@ -179,15 +178,15 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     try {
       const fileContent = Bun.file(foundCallback)
 
-      return await new Response(fileContent, {
+      return new Response(fileContent, {
         headers: {
           'Content-Type': 'text/html',
           'Access-Control-Allow-Origin': '*',
           'Access-Control-Allow-Headers': '*',
         },
       })
     } catch (error) {
-      return await new Response('Error reading the HTML file', {
+      return new Response('Error reading the HTML file', {
         status: 500,
         headers: {
           'Access-Control-Allow-Origin': '*',
@@ -198,7 +197,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
   }
 
   if (isString(foundCallback))
-    return await new Response(foundCallback, {
+    return new Response(foundCallback, {
       headers: {
         'Content-Type': 'json',
         'Access-Control-Allow-Origin': '*',
@@ -210,7 +209,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
   if (isFunction(foundCallback)) {
     const result = foundCallback()
 
-    return await new Response(JSON.stringify(result), {
+    return new Response(JSON.stringify(result), {
       status: 200,
       headers: {
         'Access-Control-Allow-Origin': '*',
@@ -223,7 +222,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     if (foundCallback.status === 401) {
       const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(rest), {
+      return new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -236,7 +235,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     if (foundCallback.status === 403) {
       const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(rest), {
+      return new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -249,7 +248,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     if (foundCallback.status === 422) {
       const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(rest), {
+      return new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -262,15 +261,15 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     if (foundCallback.status === 500) {
       const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(rest), {
+      return new Response(JSON.stringify(rest), {
         headers: { 'Content-Type': 'json', 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*' },
         status: 500,
       })
     }
   }
 
   if (isObject(foundCallback)) {
-    return await new Response(JSON.stringify(foundCallback), {
+    return new Response(JSON.stringify(foundCallback), {
       headers: {
         'Content-Type': 'json',
         'Access-Control-Allow-Origin': '*',
@@ -281,7 +280,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
   }
 
   // If no known type matched, return a generic error.
-  return await new Response('Unknown callback type.', {
+  return new Response('Unknown callback type.', {
     headers: {
       'Content-Type': 'json',
       'Access-Control-Allow-Origin': '*',

storage/framework/server/build.ts

@@ -45,16 +45,15 @@ async function main() {
     pkgName: 'server',
   })
 
-  const entrypoints = await glob([path.appPath('*.ts'), path.appPath('**/*.ts')])
-
   const r2 = await build({
-    entrypoints,
+    entrypoints: await glob([path.appPath('*.ts'), path.appPath('**/*.ts')]),
     outdir: path.frameworkPath('server/dist'),
     format: 'esm',
     target: 'bun',
     sourcemap: 'linked',
     // minify: true,
     splitting: true,
+    external: ['@swc/wasm'],
   })
 
   // TODO: this is a bundler issue and those files should not need to be copied, and that's why we handle the cleanup here as well
@@ -72,6 +71,20 @@ async function main() {
     }
   }
 
+  // Process files in the ./dist folder
+  // need to remove export `{ ENV_KEY, ENV_SECRET, fromEnv };` from whatever file that contains it in the dist/*
+  // TODO: test later, potentially a bundler issue
+  const distFiles = await glob([path.userServerPath('dist/*.js')])
+  for (const file of distFiles) {
+    let content = await fs.readFile(file, 'utf-8')
+    if (content.includes('export { ENV_KEY, ENV_SECRET, fromEnv };')) {
+      content = content.replace(/export { ENV_KEY, ENV_SECRET, fromEnv };/g, '')
+      await fs.writeFile(file, content, 'utf-8')
+      log.info(`Updated imports in ${file}`, { styled: false })
+      break
+    }
+  }
+
   await outro({
     dir: import.meta.dir,
     startTime: perf,

storage/framework/server/package.json

@@ -39,7 +39,7 @@
   "files": ["README.md", "dist", "src"],
   "scripts": {
     "dev": "./dev local",
-    "dev:cloud": "docker run -d -p 3000:3000 stacks",
+    "dev:cloud": "docker run -d -p 3000:3000 --name stacks-server --restart unless-stopped stacks",
     "build": "bun build.ts"
   },
   "dependencies": {