chore: wip

Author: chrisbbreuer

bun.lockb

@@ -44,6 +44,7 @@
     "build:web-components": "bun run buddy build:web-components",
     "build:functions": "bun run buddy build:functions // needs to have option to ",
     "build:docs": "bun run buddy build:docs",
+    "build:server": "bun run buddy build:server",
     "build:stacks": "bun run buddy build:stacks",
     "prod": "bun run buddy build",
     "prod:components": "bun run buddy build:components",

package.json

@@ -2,6 +2,6 @@ import { log } from '@stacksjs/cli'
 import { buddyPath } from '@stacksjs/path'
 import { $ } from 'bun'
 
-log.info('Building CLI')
+log.info('Building CLI...')
 
 await $`bun ${buddyPath('compile.ts')}`

storage/framework/core/actions/src/build/cli.ts

@@ -0,0 +1,9 @@
+import { log } from '@stacksjs/cli'
+import { buddyPath, frameworkPath } from '@stacksjs/path'
+import { $ } from 'bun'
+
+log.info('Building Server...')
+
+$.cwd(frameworkPath('server'))
+
+await $`bun build.ts`

storage/framework/core/actions/src/build/server.ts

@@ -19,6 +19,8 @@ export function build(buddy: CLI) {
     pages: 'Build your frontend',
     docs: 'Build your documentation',
     framework: 'Build Stacks framework',
+    cli: 'Automagically build the CLI',
+    server: 'Build the Stacks cloud server (Docker image)',
     select: 'What are you trying to build?',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
@@ -36,6 +38,7 @@ export function build(buddy: CLI) {
     .option('-b, --buddy', descriptions.buddy, { default: false })
     .option('-s, --stacks', descriptions.framework, { default: false })
     .option('-p, --project', descriptions.project, { default: false })
+    .option('--server', descriptions.server, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (server: string | undefined, options: BuildOptions) => {
       switch (server) {
@@ -66,6 +69,9 @@ export function build(buddy: CLI) {
         case 'stacks':
           options.stacks = true
           break
+        case 'server':
+          options.stacks = true
+          break
         default:
           break
       }
@@ -109,7 +115,7 @@ export function build(buddy: CLI) {
     })
 
   buddy
-    .command('build:cli', 'Automagically build the CLI')
+    .command('build:cli', descriptions.cli)
     .alias('prod:cli')
     .option('-b, --buddy', descriptions.buddy, { default: true })
     .option('-p, --project', descriptions.project, { default: false })
@@ -118,6 +124,16 @@ export function build(buddy: CLI) {
       await runAction(Action.BuildCli, options)
     })
 
+  buddy
+    .command('build:server', descriptions.server)
+    .alias('prod:server')
+    .alias('build:docker')
+    .option('-p, --project', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: BuildOptions) => {
+      await runAction(Action.BuildServer, options)
+    })
+
   buddy
     .command('build:functions', 'Automagically build function library for npm/CDN distribution')
     .option('-f, --functions', descriptions.functions, { default: true })

storage/framework/core/buddy/src/commands/build.ts

@@ -63,6 +63,7 @@
     "build:web-components": "bun run buddy build:web-components",
     "build:functions": "bun run buddy build:functions // needs to have option to ",
     "build:docs": "bun run buddy build:docs",
+    "build:server": "bun run buddy build:server",
     "build:stacks": "bun run buddy build:stacks",
     "prod": "bun run buddy build",
     "prod:components": "bun run buddy build:components",

storage/framework/core/bun-create/stx/package.json

@@ -47,7 +47,7 @@ export class SecurityStack {
     this.certificate = new acm.Certificate(scope, 'Certificate', {
       domainName: props.domain,
       validation: acm.CertificateValidation.fromDns(props.zone),
-      subjectAlternativeNames: [`www.${props.domain}`, `api.${props.domain}`],
+      subjectAlternativeNames: [`www.${props.domain}`],
     })
   }
 

storage/framework/core/cloud/src/cloud/security.ts

@@ -186,6 +186,8 @@ export async function deleteJumpBox(stackName?: string) {
   if (!jumpBoxId)
     return err('Jump-box not found')
 
+  log.info(`Deleting jump-box ${jumpBoxId}...`)
+
   return await deleteEc2Instance(jumpBoxId, stackName)
 }
 
@@ -203,6 +205,7 @@ export async function deleteIamUsers() {
 
   const promises = users.map(async (user) => {
     const userName = user.UserName || ''
+
     log.info(`Deleting IAM user: ${userName}`)
 
     // Get the list of policies attached to the user
@@ -251,12 +254,15 @@ export async function deleteStacksBuckets() {
       // List all objects in the bucket
       const objects = await s3.listObjectsV2({ Bucket: bucketName })
       log.info(`Finished listing bucket ${bucketName} objects`)
+
       // Delete all objects
       if (objects.Contents) {
         log.info('Deleting bucket objects...')
+
         await Promise.all(objects.Contents.map(object =>
           s3.deleteObject({ Bucket: bucketName, Key: object.Key || '' }).catch(error => handleError(error)),
         ))
+
         log.info(`Finished deleting objects from bucket ${bucketName}`)
       }
 
@@ -273,24 +279,29 @@ export async function deleteStacksBuckets() {
 
         // Delete all delete markers
         log.info(`Deleting bucket ${bucketName} delete markers...`)
+
         if (versions.DeleteMarkers) {
           await Promise.all(versions.DeleteMarkers.map(marker =>
             s3.deleteObject({ Bucket: bucketName, Key: marker.Key || '', VersionId: marker.VersionId }),
           )).catch(error => handleError(error))
+
           log.info(`Finished deleting delete markers from bucket ${bucketName}`)
         }
 
         // If the bucket has uncompleted multipart uploads, you need to abort them
         const uploads = await s3.listMultipartUploads({ Bucket: bucketName })
         if (uploads.Uploads) {
           log.info('Aborting bucket multipart uploads...')
+
           await Promise.all(uploads.Uploads.map(upload =>
             s3.abortMultipartUpload({ Bucket: bucketName, Key: upload.Key || '', UploadId: upload.UploadId }),
           )).catch(error => handleError(error))
+
           log.info(`Finished aborting multipart uploads from bucket ${bucketName}`)
         }
 
         await s3.deleteBucket({ Bucket: bucketName }).catch(error => handleError(error))
+
         log.info(`Bucket ${bucketName} deleted`)
       }
       catch (error) {
@@ -322,6 +333,7 @@ export async function deleteStacksFunctions() {
   await Promise.all(promises).catch((error: Error) => {
     if (error.message.includes('it is a replicated function')) {
       log.info('Function is replicated, skipping...')
+
       return ok('CloudFront is still deleting the some functions. Try again later.')
     }
 
@@ -334,7 +346,6 @@ export async function deleteStacksFunctions() {
 export async function deleteLogGroups() {
   try {
     const client = new CloudWatchLogsClient({ region: 'us-east-1' })
-
     const logGroups: DescribeLogGroupsCommandOutput = await client.send(new DescribeLogGroupsCommand({}))
 
     if (!logGroups?.logGroups)
@@ -391,6 +402,7 @@ export async function hasBeenDeployed() {
 
   try {
     const response = await s3.send(new ListBucketsCommand({}))
+
     return ok(response.Buckets?.some(bucket => bucket.Name?.includes(config.app.name?.toLocaleLowerCase() || 'stacks')) || false)
   }
   catch (error) {

storage/framework/core/cloud/src/helpers.ts

@@ -57,6 +57,7 @@ export enum Action {
   BuildDesktop = 'build/desktop',
   BuildDocs = 'build/docs',
   BuildFunctionLib = 'build-function-lib',
+  BuildServer = 'build/server',
   Changelog = 'changelog',
   Clean = 'clean',
   DevComponents = 'dev/components',

storage/framework/core/enums/src/index.ts

@@ -45,13 +45,12 @@
     "prepublishOnly": "bun --bun run build"
   },
   "peerDependencies": {
-    "node-cron": "3.0.3"
+    "cron": "^3.1.6"
   },
   "dependencies": {
-    "node-cron": "3.0.3"
+    "cron": "^3.1.6"
   },
   "devDependencies": {
-    "@stacksjs/development": "workspace:*",
-    "@types/node-cron": "^3.0.11"
+    "@stacksjs/development": "workspace:*"
   }
 }