chore: wip

Author: chrisbbreuer

storage/framework/server/.gitignore

@@ -0,0 +1,13 @@
+bootstrap
+*bun-build
+Actions
+app
+config
+core
+docs
+routes
+server
+storage
+env.ts
+cdk.context.json
+cdk.out

storage/framework/server/README.md

@@ -8,11 +8,10 @@ This directory is used to store files to build the Docker image for the server.
 
 ## Notes
 
-We use a custom `tsconfig.json` file to ensure that the aliases point to the correct paths.
+We use a custom `tsconfig.json` file to ensure that the aliases point to the correct paths within the Docker image.
 
 ### TODO
 
-- [ ] Don't include node_modules in the Docker image, but bundle it using Bun
-- [ ] Include bun.lockb file to build the Docker image && the `--frozen-lockfile` flag
+- [ ] Don't include `node_modules` in the Docker image, but bundle it using Bun
 - [ ] Ensure to use workspaces in the `package.json` file
 - [ ] No need for ./Actions because ./app/Actions

storage/framework/server/build.ts

@@ -1,13 +1,31 @@
 import process from 'node:process'
 import { log } from '@stacksjs/cli'
 import { cloud } from '@stacksjs/config'
+import { intro, outro } from '../core/build/src'
 import { buildDockerImage, useCustomOrDefaultServerConfig } from './src/utils'
 
 async function main() {
+  const { startTime } = await intro({
+    dir: import.meta.dir,
+  })
+
+  const result = await Bun.build({
+    entrypoints: ['./src/index.ts'],
+    outdir: './dist',
+    format: 'esm',
+    target: 'bun',
+  })
+
   await useCustomOrDefaultServerConfig()
 
   if (cloud.api?.deploy)
     await buildDockerImage()
+
+  await outro({
+    dir: import.meta.dir,
+    startTime,
+    result,
+  })
 }
 
 main().catch((error) => {

storage/framework/server/src/utils.ts

@@ -1,5 +1,5 @@
 import process from 'node:process'
-import { log, runCommand } from '@stacksjs/cli'
+import { log } from '@stacksjs/cli'
 import { app } from '@stacksjs/config'
 import { frameworkCloudPath, frameworkPath, projectPath } from '@stacksjs/path'
 import { hasFiles } from '@stacksjs/storage'
@@ -8,8 +8,11 @@ import { $ } from 'bun'
 
 export async function cleanCopy(sourcePath: string, targetPath: string) {
   $.cwd(frameworkPath('server'))
+  log.debug(`Deleting ${targetPath} ...`)
   await $`rm -rf ${targetPath}`.text()
+  log.debug(`Copying ${sourcePath} to ${targetPath} ...`)
   await $`cp -r ${sourcePath} ${targetPath}`.text()
+  log.debug(`Done copying ${sourcePath} to ${targetPath}`)
 }
 
 export async function useCustomOrDefaultServerConfig() {
@@ -29,10 +32,14 @@ export async function buildDockerImage() {
   log.info('Preparing build...')
 
   // delete old CDK relating files, to always build fresh
-  await $`rm -rf ${frameworkCloudPath('cdk.out/')}`
-  await $`rm -rf ${frameworkCloudPath('cdk.context.json')}`
-  await $`rm -rf ${frameworkCloudPath('dist.zip')}`
+  log.debug('Deleting old CDK files...')
+  await $`rm -rf ${frameworkCloudPath('cdk.out/')}`.text()
+  log.debug('Deleting old CDK context file...')
+  await $`rm -rf ${frameworkCloudPath('cdk.context.json')}`.text()
+  log.debug('Deleting old dist.zip file...')
+  await $`rm -rf ${frameworkCloudPath('dist.zip')}`.text()
 
+  log.info('Copying project files...')
   await cleanCopy(projectPath('config'), frameworkPath('server/config'))
   await cleanCopy(projectPath('routes'), frameworkPath('server/routes'))
   await cleanCopy(projectPath('app'), frameworkPath('server/app'))
@@ -45,7 +52,8 @@ export async function buildDockerImage() {
   }
 
   $.cwd(frameworkPath('server'))
-  // TODO: need to build index.ts into index.js and then run that from within the Dockerfile
+
+  // build index.ts into index.js, to then use within the Dockerfile
   await $`bun run build`.text()
 
   // this currently does not need to be enabled because our CDK deployment handles the docker build process