stacks 0.62.0 → 0.63.0

package/buddy/build.ts

@@ -4,6 +4,7 @@ await Bun.build({
   outdir: './dist',
   format: 'esm',
   target: 'bun',
+  sourcemap: 'linked',
   splitting: true,
 
   external: [

package/buddy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/buddy",
   "type": "module",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -50,24 +50,25 @@
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "contributors": [
-    "Chris Breuer <chris@stacksjs.org>"
-  ],
+  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
   "bin": {
     "stacks": "dist/cli.mjs",
     "stx": "dist/cli.mjs",
     "buddy": "dist/cli.mjs",
     "bud": "dist/cli.mjs"
   },
-  "files": [
-    "README.md",
-    "dist",
-    "src"
-  ],
+  "files": ["README.md", "dist", "src"],
   "scripts": {
     "buddy": "bunx ./src/cli.ts",
     "build": "bun --bun build.ts && bun run compile",
     "compile": "bun build ./bin/cli.ts --compile --minify --sourcemap --outfile dist/stacks",
+    "compile:linux:x64-modern": "bun build ./bin/cli.ts --compile --target=bun-linux-x64-modern --minify --sourcemap --outfile dist/stacks",
+    "compile:linux:x64-baseline": "bun build ./bin/cli.ts --compile --target=bun-linux-x64-baseline --minify --sourcemap --outfile dist/stacks",
+    "compile:linux:arm64": "bun build ./bin/cli.ts --compile --target=bun-linux-arm64 --minify --sourcemap --outfile dist/stacks",
+    "compile:windows:x64-modern": "bun build ./bin/cli.ts --compile --target=bun-windows-x64-modern --minify --sourcemap --outfile dist/stacks",
+    "compile:windows:x64-baseline": "bun build ./bin/cli.ts --compile --target=bun-windows-x64-baseline --minify --sourcemap --outfile dist/stacks",
+    "compile:mac:arm64": "bun build ./bin/cli.ts --compile --target=bun-darwin-arm64 --minify --sourcemap --outfile dist/stacks",
+    "compile:mac:x64": "bun build ./bin/cli.ts --compile --target=bun-darwin-x64 --minify --sourcemap --outfile dist/stacks",
     "typecheck": "bun --bun tsc --noEmit",
     "prepublishOnly": "bun run build"
   },

package/buddy/src/commands/cloud.ts

@@ -1,5 +1,6 @@
 import process from 'node:process'
-import { intro, italic, log, outro, prompts, runCommand, runCommandSync, underline } from '@stacksjs/cli'
+import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront'
+import { intro, italic, log, outro, prompts, runCommand, underline } from '@stacksjs/cli'
 import {
   addJumpBox,
   deleteCdkRemnants,
@@ -9,6 +10,7 @@ import {
   deleteParameterStore,
   deleteStacksBuckets,
   deleteStacksFunctions,
+  getCloudFrontDistributionId,
   getJumpBoxInstanceId,
 } from '@stacksjs/cloud'
 import { path as p } from '@stacksjs/path'
@@ -21,9 +23,12 @@ export function cloud(buddy: CLI) {
     cloud: 'Interact with the Stacks Cloud',
     ssh: 'SSH into the Stacks Cloud',
     add: 'Add a resource to the Stacks Cloud',
-    remove: 'Removes the Stacks Cloud. In case it fails, try again',
-    optimizeCost: 'Removes certain resources that may be re-applied at a later time',
-    cleanUp: 'Removes all resources that were retained during the cloud deletion',
+    remove: 'Remove the Stacks Cloud. In case it fails, try again',
+    optimizeCost: 'Remove certain resources that may be re-applied at a later time',
+    cleanUp: 'Remove all resources that were retained during the cloud deletion',
+    invalidateCache: 'Invalidate the CloudFront cache',
+    diff: 'Show the diff of the current, undeployed cloud changes ',
+    paths: 'The paths to invalidate',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
   }
@@ -32,13 +37,16 @@ export function cloud(buddy: CLI) {
     .command('cloud', descriptions.cloud)
     .option('--ssh', descriptions.ssh, { default: false })
     .option('--connect', descriptions.ssh, { default: false })
+    .option('--invalidate-cache', descriptions.invalidateCache, { default: false })
+    .option('--paths [paths]', descriptions.paths)
+    .option('--diff', descriptions.diff, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud` ...', options)
+      const startTime = performance.now()
 
       if (options.ssh || options.connect) {
-        const startTime = performance.now()
         const jumpBoxId = await getJumpBoxInstanceId()
         const result = await runCommand(`aws ssm start-session --target ${jumpBoxId}`, {
           ...options,
@@ -59,7 +67,69 @@ export function cloud(buddy: CLI) {
         process.exit(ExitCode.Success)
       }
 
-      log.info('Not implemented yet. Please use the --ssh (or --connect) flag to connect to the Stacks Cloud.')
+      if (options.invalidateCache) {
+        const { confirm } = await prompts({
+          name: 'confirm',
+          type: 'confirm',
+          message: 'Would you like to invalidate the CDN (CloudFront) cache?',
+        })
+
+        if (!confirm) {
+          await outro('Exited', { startTime, useSeconds: true })
+          process.exit(ExitCode.Success)
+        }
+
+        log.info('Invalidating the CloudFront cache...')
+
+        const cloudfront = new CloudFrontClient()
+        const distributionId = await getCloudFrontDistributionId()
+
+        const params = {
+          DistributionId: distributionId,
+          InvalidationBatch: {
+            CallerReference: `${Date.now()}`,
+            Paths: {
+              Quantity: 1,
+              Items: [
+                '/*',
+                /* more items */
+              ],
+            },
+          },
+        }
+
+        const command = new CreateInvalidationCommand(params)
+
+        cloudfront.send(command).then(
+          (data) => console.log(data),
+          (err) => console.log(err, err.stack),
+        )
+
+        await outro('Exited', { startTime, useSeconds: true })
+        process.exit(ExitCode.Success)
+      }
+
+      if (options.diff) {
+        const result = await runCommand('npx cdk diff', {
+          cwd: p.frameworkCloudPath(),
+          stdin: 'pipe',
+        })
+
+        if (result.isErr()) {
+          await outro(
+            'While running the cloud diff command, there was an issue',
+            { startTime, useSeconds: true },
+            result.error,
+          )
+          process.exit(ExitCode.FatalError)
+        }
+
+        await outro('Showing diff of the current, undeployed cloud changes', { startTime, useSeconds: true })
+        console.log(result.value)
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Not implemented yet. Read more about `buddy cloud` here: https://stacksjs.org/docs/cloud')
       process.exit(ExitCode.Success)
     })
 
@@ -168,9 +238,9 @@ export function cloud(buddy: CLI) {
       // sleep for 2 seconds to get the user to read the message
       await new Promise((resolve) => setTimeout(resolve, 2000))
 
-      const result = await runCommand(`bunx cdk destroy`, {
+      const result = await runCommand(`npx cdk destroy`, {
         ...options,
-        cwd: p.cloudPath(),
+        cwd: p.frameworkCloudPath(),
         stdin: 'inherit',
       })
 
@@ -196,8 +266,9 @@ export function cloud(buddy: CLI) {
       try {
         log.info('Finalizing the removal of your cloud resources.')
         log.info('This will take a few moments...')
-        loop(7, () => {
-          runCommandSync('buddy cloud:cleanup', {
+        // sometimes, this fails, so we need to retry it until all resources are deleted -> weird workaround, and would love a more stable alternative
+        await loop(7, async () => {
+          await runCommand('buddy cloud:cleanup', {
             ...options,
             cwd: p.projectPath(),
             stdout: 'ignore',
@@ -373,6 +444,89 @@ export function cloud(buddy: CLI) {
       process.exit(ExitCode.Success)
     })
 
+  buddy
+    .command('cloud:invalidate-cache', descriptions.invalidateCache)
+    .option('--paths [paths]', descriptions.paths, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: CloudCliOptions) => {
+      log.debug('Running `buddy cloud:invalidate-cache` ...', options)
+
+      const startTime = await intro('buddy cloud:invalidate-cache')
+
+      const { confirm } = await prompts({
+        name: 'confirm',
+        type: 'confirm',
+        message: 'Would you like to invalidate the CloudFront cache?',
+      })
+
+      if (!confirm) {
+        await outro('Exited', { startTime, useSeconds: true })
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Invalidating the CloudFront cache...')
+      // const result = await runCommand('aws cloudfront create-invalidation --distribution-id E1U4Z2E9NJW9J --paths "/*"', {
+      //   ...options,
+      //   cwd: p.projectPath(),
+      //   stdin: 'pipe',
+      // })
+
+      if (options.paths) {
+        const result = await runCommand(
+          `aws cloudfront create-invalidation --distribution-id E1U4Z2E9NJW9J --paths ${options.paths}`,
+          {
+            ...options,
+            cwd: p.projectPath(), // TODO: this should be the cloud path
+            stdin: 'pipe',
+          },
+        ) // TODO: this should be the cloud path
+
+        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 })
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Not implemented yet. Read more about `buddy cloud` here: https://stacksjs.org/docs/cloud')
+      process.exit(ExitCode.Success)
+    })
+
+  buddy
+    .command('cloud:diff', descriptions.diff)
+    .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: CloudCliOptions) => {
+      log.debug('Running `buddy cloud:diff` ...', options)
+
+      const startTime = await intro('buddy cloud:diff')
+
+      const result = await runCommand('npx cdk diff', {
+        cwd: p.frameworkCloudPath(),
+        stdin: 'pipe',
+      })
+
+      if (result.isErr()) {
+        await outro(
+          'While running the cloud diff command, there was an issue',
+          { startTime, useSeconds: true },
+          result.error,
+        )
+        process.exit(ExitCode.FatalError)
+      }
+
+      await outro('Showing diff of the current, undeployed cloud changes', { startTime, useSeconds: true })
+      console.log(result.value)
+      process.exit(ExitCode.Success)
+    })
+
   buddy.on('cloud:*', () => {
     console.error('Invalid command: %s\nSee --help for a list of available commands.', buddy.args.join(' '))
     process.exit(1)

package/buddy/src/commands/configure.ts

@@ -62,7 +62,8 @@ async function configureAws(options?: ConfigureOptions) {
   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 profile = process.env.AWS_PROFILE ?? options?.profile
+  const command = profile ? `aws configure --profile ${profile}` : `aws configure`
   const input = `${awsAccessKeyId}\n${awsSecretAccessKey}\n${defaultRegion}\n${defaultOutputFormat}\n`
 
   const result = await runCommand(command, {

package/buddy/src/commands/deploy.ts

@@ -4,27 +4,38 @@ import { intro, italic, log, outro, runCommand } from '@stacksjs/cli'
 import { app } from '@stacksjs/config'
 import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
 import { Action } from '@stacksjs/enums'
+import { path as p } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, DeployOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 
 export function deploy(buddy: CLI) {
   const descriptions = {
-    deploy: 'Re-installs your npm dependencies',
+    deploy: 'Deploy your project',
     project: 'Target a specific project',
+    production: 'Deploy to production',
+    development: 'Deploy to development',
+    staging: 'Deploy to staging',
+    domain: 'Specify a domain to deploy to',
     verbose: 'Enable verbose output',
   }
 
   buddy
-    .command('deploy', descriptions.deploy)
-    .option('--domain', 'Specify a domain to deploy to', { default: undefined })
+    .command('deploy [env]', descriptions.deploy)
+    .option('--domain', descriptions.domain, { default: undefined })
     .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--prod', descriptions.production, { default: true })
+    .option('--dev', descriptions.development, { default: false })
+    .option('--staging', descriptions.staging, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (options: DeployOptions) => {
+    .action(async (env: string | undefined, options: DeployOptions) => {
       log.debug('Running `buddy deploy` ...', options)
 
       const startTime = await intro('buddy deploy')
       const domain = options.domain || app.url
 
+      if (options.prod || env === 'production' || env === 'prod') await confirmProductionDeployment()
+
       if (!domain) {
         log.info('No domain found in your .env or ./config/app.ts')
         log.info('Please ensure your domain is properly configured.')
@@ -35,6 +46,7 @@ export function deploy(buddy: CLI) {
       log.info(`Deploying to ${italic(domain)}`)
 
       await checkIfAwsIsConfigured()
+      await checkIfAwsIsBootstrapped()
 
       options.domain = await configureDomain(domain, options, startTime)
 
@@ -58,6 +70,15 @@ export function deploy(buddy: CLI) {
   })
 }
 
+async function confirmProductionDeployment() {
+  const answer = await log.prompt.require().confirm('Are you sure you want to deploy to production?')
+
+  if (!answer) {
+    log.info('Aborting deployment...')
+    process.exit(ExitCode.InvalidArgument)
+  }
+}
+
 async function configureDomain(domain: string, options: DeployOptions, startTime: number) {
   if (!domain) {
     log.info('We could not identify a domain to deploy to.')
@@ -130,3 +151,33 @@ async function checkIfAwsIsConfigured() {
 
   log.success('AWS is configured')
 }
+
+async function checkIfAwsIsBootstrapped() {
+  try {
+    log.info('Ensuring AWS is bootstrapped...')
+    // const toolkitName = 'stacks-toolkit'
+    await runCommand('aws cloudformation describe-stacks --stack-name stacks-toolkit', { silent: true })
+    // await $`aws cloudformation describe-stacks --stack-name stacks-toolkit`.quiet()
+    log.success('AWS is bootstrapped')
+
+    return true
+  } catch (err: any) {
+    log.debug(`Not yet bootstrapped. Failed with code ${err.exitCode}`)
+    log.debug(err.stdout.toString())
+    log.debug(err.stderr.toString())
+
+    log.info('AWS is not bootstrapped yet')
+    log.info('Bootstrapping. This may take a few moments...')
+
+    try {
+      $.cwd(p.frameworkCloudPath())
+      const result = await $`bun run bootstrap`
+      console.log(result)
+      return true
+    } catch (error) {
+      log.error('Failed to bootstrap AWS')
+      console.error(error)
+      process.exit(ExitCode.FatalError)
+    }
+  }
+}

package/buddy/src/commands/dev.ts

@@ -17,8 +17,8 @@ import type { CLI, DevOptions } from '@stacksjs/types'
 
 export function dev(buddy: CLI) {
   const descriptions = {
-    dev: 'Starts development server',
-    frontend: 'Starts the frontend development server',
+    dev: 'Start development server',
+    frontend: 'Start the frontend development server',
     components: 'Start the Components development server',
     desktop: 'Start the Desktop App development server',
     dashboard: 'Start the Dashboard development server',

package/buddy/src/commands/make.ts

@@ -327,12 +327,11 @@ export function make(buddy: CLI) {
       log.debug('Running `buddy make:certificate` ...', options)
 
       const domain = await localUrl()
-      log.info(`Creating SSL certificate...`)
 
+      log.info(`Creating SSL certificate...`)
       await runCommand(`tlsx ${domain}`, {
         cwd: p.projectStoragePath('keys'),
       })
-
       log.success('Certificate created')
 
       log.info(`Installing SSL certificate...`)

package/buddy/src/commands/migrate.ts

@@ -62,7 +62,7 @@ export function migrate(buddy: CLI) {
         process.exit()
       }
 
-      await outro(`All tables dropped successfully`, {
+      await outro(`All tables dropped successfully & migrated successfully`, {
         startTime: perf,
         useSeconds: true,
       })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stacks",
   "type": "module",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "The Stacks framework.",
   "author": "Chris Breuer",
   "license": "MIT",