stacks 0.58.56 → 0.58.58

package/core/buddy/src/commands/configure.ts

@@ -2,7 +2,6 @@ import process from 'node:process'
 import type { CLI, ConfigureOptions } from '@stacksjs/types'
 import { log, outro, runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
-import { config } from '@stacksjs/config'
 import { ExitCode } from '@stacksjs/types'
 
 export function configure(buddy: CLI) {
@@ -10,6 +9,7 @@ export function configure(buddy: CLI) {
     configure: 'Configure options',
     aws: 'Configure the AWS connection',
     project: 'Target a specific project',
+    profile: 'The AWS profile to use',
     verbose: 'Enable verbose output',
   }
 
@@ -20,19 +20,7 @@ export function configure(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options?: ConfigureOptions) => {
       if (options?.aws) {
-        const startTime = performance.now()
-        const result = await runCommand('aws configure', {
-          ...options,
-          cwd: p.projectPath(),
-          stdin: 'inherit',
-        })
-
-        if (result.isErr()) {
-          await outro('While running the configure command, there was an issue', { startTime, useSeconds: true }, result.error)
-          process.exit(ExitCode.FatalError)
-        }
-
-        await outro('Exited', { startTime, useSeconds: true })
+        await configureAws(options)
         process.exit(ExitCode.Success)
       }
 
@@ -43,21 +31,15 @@ export function configure(buddy: CLI) {
   buddy
     .command('configure:aws', descriptions.aws)
     .option('-p, --project', descriptions.project, { default: false })
+    .option('--profile', descriptions.profile, { default: process.env.AWS_PROFILE })
     .option('--verbose', descriptions.verbose, { default: false })
+    .option('--access-key-id', 'The AWS access key')
+    .option('--secret-access-key', 'The AWS secret access key')
+    .option('--region', 'The AWS region')
+    .option('--output', 'The AWS output format')
+    .option('--quiet', 'Suppress output')
     .action(async (options?: ConfigureOptions) => {
-      const startTime = performance.now()
-      const result = await runCommand(`aws configure --profile ${config.app.url}`, {
-        ...options,
-        cwd: p.cloudPath(),
-        stdin: 'inherit',
-      })
-
-      if (result.isErr()) {
-        await outro('While running the cloud command, there was an issue', { startTime, useSeconds: true }, result.error)
-        process.exit(ExitCode.FatalError)
-      }
-
-      await outro('Exited', { startTime, useSeconds: true })
+      await configureAws(options)
       process.exit(ExitCode.Success)
     })
 
@@ -66,3 +48,32 @@ export function configure(buddy: CLI) {
     process.exit(ExitCode.FatalError)
   })
 }
+
+async function configureAws(options: ConfigureOptions) {
+  const startTime = performance.now()
+
+  const awsAccessKeyId = options?.accessKeyId ?? process.env.AWS_ACCESS_KEY_ID
+  const awsSecretAccessKey = options?.secretAccessKey ?? process.env.AWS_SECRET_ACCESS_KEY
+  const defaultRegion = 'us-east-1' // we only support `us-east-1` for now
+  const defaultOutputFormat = options?.output ?? 'json'
+
+  const command = `aws configure --profile ${options.profile ?? process.env.AWS_PROFILE}`
+  const input = `${awsAccessKeyId}\n${awsSecretAccessKey}\n${defaultRegion}\n${defaultOutputFormat}\n`
+
+  const result = await runCommand(command, {
+    ...options,
+    cwd: p.projectPath(),
+    stdin: 'pipe', // set stdin mode to 'pipe' to write to it
+    input, // the actual input to write
+  })
+
+  if (result.isErr()) {
+    await outro('While running the cloud command, there was an issue', { startTime, useSeconds: true }, result.error)
+    process.exit(ExitCode.FatalError)
+  }
+
+  if (options.quiet)
+    return
+
+  await outro('Exited', { startTime, useSeconds: true })
+}

package/core/buddy/src/commands/deploy.ts

@@ -3,7 +3,7 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, DeployOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, italic, log, outro } from '@stacksjs/cli'
+import { intro, italic, log, outro, runCommand } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { app } from '@stacksjs/config'
 import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
@@ -25,72 +25,24 @@ export function deploy(buddy: CLI) {
       const domain = options.domain || app.url
 
       if (!domain) {
-        log.info('We could not identify a domain to deploy to.')
-        log.info('Please set your .env or ./config/app.ts properly.')
-        console.log('')
-        log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
-        console.log('')
-        log.info('   ➡️  Example: `buddy deploy --domain example.com`')
-        console.log('')
+        log.info('No domain found in your .env or ./config/app.ts')
+        log.info('Please ensure your domain is properly configured.')
+        log.info('For more info, check out the docs or join our Discord.')
         process.exit(ExitCode.FatalError)
       }
 
-      // TODO: we can improve this check at some point, otherwise domains that legitimately include the word localhost will fail
-      // TODO: add check for whether the local APP_ENV is getting deployed, if so, ask if the user meant to deploy `dev`
-      if (domain.includes('localhost')) {
-        log.info('You are deploying to a local environment.')
-        log.info('Please set your .env or ./config/app.ts properly.')
-        console.log('')
-        log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
-        console.log('')
-        log.info('   ➡️  Example: `buddy deploy --domain example.com`')
-        console.log('')
-        process.exit(ExitCode.FatalError)
-      }
-
-      if (await hasUserDomainBeenAddedToCloud(domain)) {
-        log.info('Domain is properly configured')
-        log.info('Your cloud is deploying...')
-
-        log.info(`${italic('This may take a while...')}`)
-        options.domain = domain
+      await checkIfAwsIsConfigured()
 
-        // now that we know the domain has been added to the users (AWS) cloud, we can deploy
-        const result = await runAction(Action.Deploy, options)
-
-        if (result.isErr()) {
-          await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
-          process.exit(ExitCode.FatalError)
-        }
-
-        await outro('Deployment succeeded.', { startTime, useSeconds: true })
-
-        process.exit(ExitCode.Success)
-      }
+      options.domain = await configureDomain(domain, options, startTime)
 
-      // if the domain hasn't been added to the user's (AWS) cloud, we will add it for them
-      // and then exit the process with prompts for the user to update their nameservers
-      console.log('')
-      log.info(`  👋  It appears to be your first ${italic(domain)} deployment.`)
-      console.log('')
-      log.info(italic('Let’s ensure it is all connected properly.'))
-      log.info(italic('One moment...'))
-      console.log('')
-
-      options.domain = domain
-      const result = await addDomain({
-        ...options,
-        deploy: true,
-        startTime,
-      })
+      const result = await runAction(Action.Deploy, options)
 
       if (result.isErr()) {
         await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
         process.exit(ExitCode.FatalError)
       }
 
-      await outro('Added your domain.', { startTime, useSeconds: true })
-      process.exit(ExitCode.Success)
+      await outro('Project deployed.', { startTime, useSeconds: true })
     })
 
   buddy.on('deploy:*', () => {
@@ -98,3 +50,76 @@ export function deploy(buddy: CLI) {
     process.exit(1)
   })
 }
+
+async function configureDomain(domain: string, options: DeployOptions, startTime: number) {
+  if (!domain) {
+    log.info('We could not identify a domain to deploy to.')
+    log.info('Please set your .env or ./config/app.ts properly.')
+    console.log('')
+    log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
+    console.log('')
+    log.info('   ➡️  Example: `buddy deploy --domain example.com`')
+    console.log('')
+    process.exit(ExitCode.FatalError)
+  }
+
+  // TODO: we can improve this check at some point, otherwise domains that legitimately include the word localhost will fail
+  // TODO: add check for whether the local APP_ENV is getting deployed, if so, ask if the user meant to deploy `dev`
+  if (domain.includes('localhost')) {
+    log.info('You are deploying to a local environment.')
+    log.info('Please set your .env or ./config/app.ts properly.')
+    console.log('')
+    log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
+    console.log('')
+    log.info('   ➡️  Example: `buddy deploy --domain example.com`')
+    console.log('')
+    process.exit(ExitCode.FatalError)
+  }
+
+  if (await hasUserDomainBeenAddedToCloud(domain)) {
+    log.info('Domain is properly configured')
+    log.info('Your cloud is deploying...')
+
+    log.info(`${italic('This may take a while...')}`)
+
+    return domain
+  }
+
+  // if the domain hasn't been added to the user's (AWS) cloud, we will add it for them
+  // and then exit the process with prompts for the user to update their nameservers
+  console.log('')
+  log.info(`  👋  It appears to be your first ${italic(domain)} deployment.`)
+  console.log('')
+  log.info(italic('Let’s ensure it is all connected properly.'))
+  log.info(italic('One moment...'))
+  console.log('')
+
+  const result = await addDomain({
+    ...options,
+    deploy: true,
+    startTime,
+  })
+
+  if (result.isErr()) {
+    await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
+    process.exit(ExitCode.FatalError)
+  }
+
+  await outro('Added your domain.', { startTime, useSeconds: true })
+  process.exit(ExitCode.Success)
+}
+
+async function checkIfAwsIsConfigured() {
+  log.info('Ensuring AWS is configured...')
+  const result = await runCommand('buddy configure:aws --quiet', {
+    silent: true,
+  })
+
+  if (result.isErr()) {
+    log.error('AWS is not configured properly.')
+    log.error('Please run `buddy configure:aws` to set up your AWS credentials.')
+    process.exit(ExitCode.FatalError)
+  }
+
+  log.success('AWS is configured')
+}

package/core/buddy/src/commands/setup.ts

@@ -79,9 +79,11 @@ export function setup(buddy: CLI) {
         }
       }
 
-      log.success('Oh My Zsh setup complete.')
+      log.success('Oh My Zsh setup complete')
       log.info('To see changes reflect, you may need to:')
-      log.info('⌘⇧P workbench.action.reloadWindow')
+      // if on vscode show the message
+      // log.info('⌘⇧P workbench.action.reloadWindow')
+      // else show the message
     })
 
   buddy.on('setup:*', () => {
@@ -149,14 +151,14 @@ async function initializeProject(options: CliOptions): Promise<void> {
 
   log.info('Ensuring AWS is connected...')
 
-  // const awsResult = await runCommand('buddy configure:aws', {
-  //   cwd: options.cwd || p.projectPath(),
-  // })
+  const awsResult = await runCommand('buddy configure:aws', {
+    cwd: options.cwd || p.projectPath(),
+  })
 
-  // if (awsResult.isErr()) {
-  //   handleError(awsResult.error)
-  //   process.exit(ExitCode.FatalError)
-  // }
+  if (awsResult.isErr()) {
+    handleError(awsResult.error)
+    process.exit(ExitCode.FatalError)
+  }
 
   log.success('Configured AWS')
 

package/core/build/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/build",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks framework build tools and configurations.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/bun-create/bud/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/bud",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/buddy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/buddy",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/stack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stack",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/stacks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stacks",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

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

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stx",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-plugin-yaml/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-yaml",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "A Bun plugin to load yaml files",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cache/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cache",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Caching the Stacks way.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -57,7 +57,7 @@
     "@stacksjs/config": "workspace:*"
   },
   "optionalDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.507.0",
+    "@aws-sdk/client-dynamodb": "^3.509.0",
     "ioredis": "^5.3.2"
   },
   "devDependencies": {

package/core/chat/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/chat",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Easily interact with chat APIs.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -48,25 +48,25 @@
     "prepublishOnly": "bun --bun run build"
   },
   "peerDependencies": {
-    "@novu/stateless": "^0.23.0",
+    "@novu/stateless": "^0.23.1",
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/types": "workspace:*"
   },
   "dependencies": {
-    "@novu/stateless": "^0.23.0",
+    "@novu/stateless": "^0.23.1",
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/types": "workspace:*"
   },
   "optionalDependencies": {
-    "@novu/discord": "^0.23.0",
-    "@novu/ms-teams": "^0.23.0",
-    "@novu/node": "^0.23.0",
-    "@novu/slack": "^0.23.0",
-    "@novu/stateless": "^0.23.0"
+    "@novu/discord": "^0.23.1",
+    "@novu/ms-teams": "^0.23.1",
+    "@novu/node": "^0.23.1",
+    "@novu/slack": "^0.23.1",
+    "@novu/stateless": "^0.23.1"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"

package/core/cli/dist/index.js

@@ -14,7 +14,7 @@ async function installStack(name, options) {
 // src/cli.ts
 import cac from "cac";
 // package.json
-var version = "0.58.56";
+var version = "0.58.58";
 
 // src/cli.ts
 function cli(name, options) {
@@ -58,6 +58,12 @@ async function exec(command, options) {
         process.exit(exitCode);
     }
   });
+  if (options?.stdin === "pipe" && options.input) {
+    if (proc.stdin) {
+      proc.stdin.write(options.input);
+      proc.stdin.end();
+    }
+  }
   const exited = await proc.exited;
   if (exited === ExitCode.Success)
     return ok(proc);

package/core/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cli",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "TypeScript framework for CLI artisans. Build beautiful console apps with ease.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cli/src/exec.ts

@@ -46,6 +46,14 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
     },
   })
 
+  // Check if we need to write to stdin
+  if (options?.stdin === 'pipe' && options.input) {
+    if (proc.stdin) {
+      proc.stdin.write(options.input)
+      proc.stdin.end()
+    }
+  }
+
   const exited = await proc.exited
   if (exited === ExitCode.Success)
     return ok(proc)

package/core/cloud/deploy.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-new */
 import 'source-map-support/register'
 import process from 'node:process'
 import { config } from '@stacksjs/config'
@@ -76,9 +75,11 @@ export const options = {
   timestamp,
 } satisfies CloudOptions
 
-new Cloud(app, name, {
+const cloud = new Cloud(app, name, {
   ...options,
   description: `The Stacks Cloud`,
 })
 
+await cloud.init()
+
 app.synth()