chore: wip

Author: chrisbbreuer

.stacks/core/actions/src/domains/add.ts

@@ -27,18 +27,31 @@ if (!options.domain) {
   }
 }
 
-logger.log(`Adding your domain: ${options.domain}`)
-
 const result = await createHostedZone(options.domain)
 
 if (result.isErr()) {
-  handleError('Failed to add domain', result.error)
+  handleError(result.error)
   process.exit(1)
 }
 
 const nameservers = result.value
 
 logger.log('')
-logger.log('✅ Added your domain')
-logger.log(`  Nameservers: ${nameservers.join(', ')}`)
-logger.log(`  Cached in: ${projectStoragePath('framework/cache/nameservers.txt')}`)
+logger.log('✅ Successfully added your domain.')
+logger.log('')
+logger.log('ℹ️  Please note, before you can you continue your deployment process,')
+logger.log('   you will need to update your nameservers to the following:')
+
+const emojis = ['1️⃣', '2️⃣', '3️⃣', '4️⃣']
+logger.log('')
+nameservers.forEach((nameserver, index) => {
+  logger.log(`  ${emojis[index]}  Nameserver: ${nameserver}`)
+})
+logger.log('')
+logger.log(italic(`cached in ${projectStoragePath('framework/cache/nameservers.txt')}`))
+logger.log('')
+logger.log('Once the nameservers have been updated, re-run the following command:')
+logger.log('')
+logger.log(`➡️  ${italic('buddy deploy')}`)
+logger.log('')
+logger.log(italic('If you have any questions, please reach out to us via Discord.'))

.stacks/core/actions/src/domains/remove.ts

@@ -26,7 +26,8 @@ if (!options.domain) {
   }
 }
 
-logger.log(`Removing domain: ${options.domain}`)
+if (options.verbose)
+  logger.log(`Removing domain: ${options.domain}`)
 
 const result = await deleteHostedZone(options.domain)
 

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

@@ -1,8 +1,10 @@
 import process from 'node:process'
 import type { CLI, DeployOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, italic, outro } from '@stacksjs/cli'
 import { Action, ExitCode } from '@stacksjs/types'
+import { config } from '@stacksjs/config'
+import { Route53 } from '@aws-sdk/client-route-53'
 
 export function deploy(buddy: CLI) {
   const descriptions = {
@@ -12,33 +14,73 @@ export function deploy(buddy: CLI) {
 
   buddy
     .command('deploy', descriptions.deploy)
+    .option('--domain', 'Specify a domain to deploy to', { default: '' })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DeployOptions) => {
       const perf = await intro('buddy deploy')
-      const result = await runAction(Action.Deploy, options)
+      const domain = options.domain || config.app.url
 
-      if (result.isErr()) {
-        await outro('While running the `buddy deploy`, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
-        process.exit()
+      if (await hasUserDomainBeenAddedToCloud(domain)) {
+        options.domain = domain
       }
 
-      await outro('Deployment succeeded.', { startTime: perf, useSeconds: true })
-      process.exit(ExitCode.Success)
-    })
+      // 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
+      else {
+        // eslint-disable-next-line no-console
+        console.log('')
+        // eslint-disable-next-line no-console
+        console.log(`ℹ️  It appears to be your first ${domain} deployment.`)
+        // eslint-disable-next-line no-console
+        console.log('')
+        // eslint-disable-next-line no-console
+        console.log(italic('Let’s ensure your it is connected properly.'))
+        // eslint-disable-next-line no-console
+        console.log(italic('One moment...'))
+        // eslint-disable-next-line no-console
+        console.log('')
 
-  buddy
-    .command('deploy:domains', descriptions.deploy)
-    .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (options: DeployOptions) => {
-      const perf = await intro('buddy deploy:domains')
-      const result = await runAction(Action.Deploy, { ...options, domains: true, verbose: options.verbose })
+        options.domain = domain
+        await addDomain(options, perf)
+        process.exit(ExitCode.Success)
+      }
+
+      // 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: perf, useSeconds: true, isError: true }, result.error)
-        process.exit()
+        process.exit(ExitCode.FatalError)
       }
 
       await outro('Deployment succeeded.', { startTime: perf, useSeconds: true })
+
       process.exit(ExitCode.Success)
     })
 }
+
+async function hasUserDomainBeenAddedToCloud(domainName?: string) {
+  const route53 = new Route53()
+
+  // Check if the hosted zone already exists
+  const existingHostedZones = await route53.listHostedZonesByName({ DNSName: domainName })
+  if (!existingHostedZones || !existingHostedZones.HostedZones)
+    return false
+
+  const existingHostedZone = existingHostedZones.HostedZones.find(zone => zone.Name === `${domainName}.`)
+  if (existingHostedZone)
+    return true
+
+  return false
+}
+
+async function addDomain(options: DeployOptions, startTime: number) {
+  const result = await runAction(Action.DomainsAdd, options)
+
+  if (result.isErr()) {
+    await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true, isError: true }, result.error)
+    process.exit(ExitCode.FatalError)
+  }
+
+  await outro('Added your domain.', { startTime, useSeconds: true })
+}

.stacks/core/cloud/src/cloud.ts

@@ -278,7 +278,7 @@ export class StacksCloud extends Stack {
 
     if (config.cloud.cdn?.enableLogging) {
       logBucket = new s3.Bucket(this, 'LogBucket', {
-        bucketName: `${this.domain}-logs-${config.app.env}`,
+        bucketName: `${this.domain}-logs-${config.app.env}-${Date.now()}`,
         removalPolicy: RemovalPolicy.DESTROY,
         autoDeleteObjects: true,
         objectOwnership: s3.ObjectOwnership.BUCKET_OWNER_PREFERRED,

.stacks/core/config/src/defaults.ts

@@ -177,7 +177,7 @@ export default {
     ],
 
     messages: {
-      type: 'Select the type of change that you\'re committing:',
+      type: 'Select the type of change that you’re committing:',
       scope: 'Select the SCOPE of this change (optional):',
       customScope: 'Select the SCOPE of this change:',
       subject: 'Write a SHORT, IMPERATIVE tense description of the change:\n',
@@ -199,7 +199,7 @@ export default {
       { value: 'test', name: 'test:     ✅  Adding missing tests or adjusting existing tests', emoji: ':white_check_mark:' },
       { value: 'build', name: 'build:    📦️  Changes that affect the build system or external dependencies', emoji: ':package:' },
       { value: 'ci', name: 'ci:       🎡  Changes to our CI configuration files and scripts', emoji: ':ferris_wheel:' },
-      { value: 'chore', name: 'chore:    🔨  Other changes that don\'t modify src or test files', emoji: ':hammer:' },
+      { value: 'chore', name: 'chore:    🔨  Other changes that don’t modify src or test files', emoji: ':hammer:' },
       { value: 'revert', name: 'revert:   ⏪️  Reverts a previous commit', emoji: ':rewind:' },
     ],
   },

.stacks/core/storage/src/fs.ts

@@ -2,4 +2,8 @@ import { mkdirSync, writeFileSync } from 'node:fs'
 import * as fs from 'fs-extra'
 import { pathExists as existsSync } from 'fs-extra'
 
+export async function exists(path: string): Promise<boolean> {
+  return await existsSync(path)
+}
+
 export { fs, existsSync, mkdirSync, writeFileSync }

.stacks/core/types/src/deploy.ts

@@ -8,5 +8,5 @@ import { type CliOptions } from './cli'
  * you have any questions, feel free to reach out via Discord or GitHub Discussions.
  */
 export interface DeployOptions extends CliOptions {
-  domains?: boolean
+  domain?: string
 }

.stacks/core/types/src/git.ts

@@ -72,7 +72,7 @@ export interface GitOptions {
    * @example
    * ```ts
    * messages: {
-   *   type: 'Select the type of change that you\'re committing:',
+   *   type: 'Select the type of change that you’re committing:',
    *   scope: 'Denote the SCOPE of this change:',
    *   subject: 'Write a SHORT, IMPERATIVE tense description of the change:\n',
    *   body: 'Provide a LONGER description of the change (optional). Use "|" to break new line:\n',

.stacks/ide/dictionary.txt

@@ -142,6 +142,7 @@ minzipped
 mkdirs
 mkdist
 mult
+nameserver
 netcore
 neverthrow
 nexe

config/git.ts

@@ -21,7 +21,7 @@ export default {
   ],
 
   messages: {
-    type: 'Select the type of change that you\'re committing:',
+    type: 'Select the type of change that you’re committing:',
     scope: 'Select the SCOPE of this change (optional):',
     customScope: 'Select the SCOPE of this change:',
     subject: 'Write a SHORT, IMPERATIVE tense description of the change:\n',
@@ -43,7 +43,7 @@ export default {
     { value: 'test', name: 'test:     ✅  Adding missing tests or adjusting existing tests', emoji: ':white_check_mark:' },
     { value: 'build', name: 'build:    📦️  Changes that affect the build system or external dependencies', emoji: ':package:' },
     { value: 'ci', name: 'ci:       🎡  Changes to our CI configuration files and scripts', emoji: ':ferris_wheel:' },
-    { value: 'chore', name: 'chore:    🔨  Other changes that don\'t modify src or test files', emoji: ':hammer:' },
+    { value: 'chore', name: 'chore:    🔨  Other changes that don’t modify src or test files', emoji: ':hammer:' },
     { value: 'revert', name: 'revert:   ⏪️  Reverts a previous commit', emoji: ':rewind:' },
   ],
 } satisfies GitConfig