stacks 0.58.50 → 0.58.52

package/core/buddy/dist/cli.js

@@ -15,10 +15,11 @@ http,
 install,
 key,
 lint,
+list,
 release,
 setup,
 upgrade
-} from "./chunk-91084836e95161e8.js";
+} from "./chunk-d52e40a990b45728.js";
 import"./chunk-0455e53fab4244b1.js";
 
 // src/cli.ts
@@ -47,6 +48,7 @@ async function main() {
   http(buddy);
   install(buddy);
   lint(buddy);
+  list(buddy);
   release(buddy);
   setup(buddy);
   upgrade(buddy);
@@ -60,6 +62,7 @@ async function main() {
     else
       console.error(`Expected a default export function in ${file}, but got:`, dynamicImport.default);
   }
+  buddy.help();
   buddy.parse();
 }
 process.on("uncaughtException", handleError);

package/core/buddy/dist/index.js

@@ -19,6 +19,7 @@ inspire,
 install,
 key,
 lint,
+list,
 make,
 migrate,
 optimizePkgxDeps,
@@ -32,7 +33,7 @@ tinker,
 types,
 upgrade,
 version
-} from "./chunk-91084836e95161e8.js";
+} from "./chunk-d52e40a990b45728.js";
 import"./chunk-0455e53fab4244b1.js";
 export {
   version,
@@ -48,6 +49,7 @@ export {
   optimizePkgxDeps,
   migrate,
   make,
+  list,
   lint,
   key,
   install,

package/core/buddy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/buddy",
   "type": "module",
-  "version": "0.58.50",
+  "version": "0.58.52",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/buddy/src/cli.ts

@@ -35,6 +35,7 @@ async function main() {
   cmd.http(buddy)
   cmd.install(buddy)
   cmd.lint(buddy)
+  cmd.list(buddy)
   // cmd.make(buddy)
   // cmd.migrate(buddy)
   cmd.release(buddy)
@@ -61,6 +62,7 @@ async function main() {
       console.error(`Expected a default export function in ${file}, but got:`, dynamicImport.default)
   }
 
+  buddy.help()
   buddy.parse()
 }
 

package/core/buddy/src/commands/build.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 })

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

@@ -36,6 +36,7 @@ export function deploy(buddy: CLI) {
       }
 
       // 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.')
@@ -48,11 +49,10 @@ export function deploy(buddy: CLI) {
       }
 
       if (await hasUserDomainBeenAddedToCloud(domain)) {
-        log.success('Your domain is properly configured.')
+        log.info('Domain is properly configured')
         log.info('Your cloud is deploying...')
 
         log.info(`${italic('This may take a while...')}`)
-        await new Promise(resolve => setTimeout(resolve, 2000))
         options.domain = domain
 
         // now that we know the domain has been added to the users (AWS) cloud, we can deploy

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

@@ -14,6 +14,7 @@ export * from './fresh'
 export * from './generate'
 export * from './http'
 export * from './lint'
+export * from './list'
 export * from './inspire'
 export * from './install'
 export * from './key'

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

@@ -0,0 +1,39 @@
+import process from 'node:process'
+import type { CLI } from '@stacksjs/types'
+import { $ } from 'bun'
+import { projectPath } from '@stacksjs/path'
+
+export function list(buddy: CLI) {
+  const descriptions = {
+    list: 'List all of the project-specific Buddy commands',
+    project: 'Target a specific project',
+    verbose: 'Enable verbose output',
+  }
+
+  buddy
+    .command('list', descriptions.list)
+    .option('-p, --project', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async () => {
+      $.cwd(projectPath())
+      const test = await $`buddy --help`.text()
+      const commandsSection = test.match(/Commands:.*?(?=For more info, run any command with the)/s)?.[0]
+
+      if (commandsSection) {
+        const cleanedCommands = commandsSection
+          .replace('Commands:', '') // Remove "Commands:"
+          .replace(/^\s+/gm, '') // Trim leading whitespace from the start of each line
+
+        // eslint-disable-next-line no-console
+        console.log(cleanedCommands)
+        return
+      }
+
+      console.error('#1 - Please reach out to our Discord for helper: https://discord.gg/stacksjs')
+    })
+
+  buddy.on('list:*', () => {
+    console.error('Invalid command: %s\nSee --help for a list of available commands.', buddy.args.join(' '))
+    process.exit(1)
+  })
+}

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

@@ -1,14 +1,17 @@
 import process from 'node:process'
 import { path as p } from '@stacksjs/path'
 import { handleError } from '@stacksjs/error-handling'
-import { storage } from '@stacksjs/storage'
+import { writeFile } from '@stacksjs/storage'
 import { log, runCommand } from '@stacksjs/cli'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, CliOptions } from '@stacksjs/types'
+import { $ } from 'bun'
 
 export function setup(buddy: CLI) {
   const descriptions = {
     setup: 'This command ensures your project is setup correctly',
+    ohMyZsh: 'Enable Oh My Zsh',
+    aws: 'Ensures AWS is connected to the project',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
   }
@@ -28,6 +31,59 @@ export function setup(buddy: CLI) {
       await initializeProject(options)
     })
 
+  buddy
+    .command('setup:oh-my-zsh', descriptions.ohMyZsh) // if triggered multiple times, it will update the plugin
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (_options?: CliOptions) => {
+      const homePath = (await $`echo $HOME`.text()).trim()
+      const zshrcPath = p.join(homePath, '.zshrc')
+      const pluginPath = p.frameworkPath('core/zsh-buddy/buddy.plugin.zsh')
+      const customPath = p.join(homePath, '.oh-my-zsh/custom/plugins/buddy/')
+
+      log.info(`Setting up Oh My Zsh via ${zshrcPath}...`)
+      $.cwd(p.dirname(zshrcPath))
+      let data = await $`cat ${p.basename(zshrcPath)}`.text()
+
+      // Manipulate the data
+      const pluginLineRegex = /^(?!#).*plugins=\(([^)]+)\)/m // ensure it's not a comment
+      const match = data.match(pluginLineRegex)
+
+      if (match) {
+        // 1. Find the plugins line
+        const plugins = match[1].split(' ')
+
+        // 2. Add buddy to the list of plugins if it's not already there
+        if (!plugins.includes('buddy')) {
+          plugins.push('buddy')
+          const newPluginLine = `plugins=(${plugins.join(' ')})`
+          // 3. Replace the old plugin line with the new one
+          data = data.replace(pluginLineRegex, newPluginLine)
+          // 4. Write the data back to the file
+          await writeFile(zshrcPath, data)
+
+          // need to copy plugin to ~/.oh-my-zsh/custom/plugins
+          log.info(`Copying buddy zsh plugin ${pluginPath} to ${customPath}...`)
+
+          // create customPath if it doesn't exist
+          await runCommand(`mkdir -p ${customPath}`)
+          await runCommand(`cp -rf ${pluginPath} ${customPath}`)
+          // await runCommand(`source ${customPath}/buddy.plugin.zsh`)
+
+          log.success('Copied buddy zsh plugin')
+        }
+        else {
+          log.info('buddy is already integrated in your shell, updating...')
+          await runCommand(`cp -rf ${pluginPath} ${customPath}`)
+          // await runCommand(`source ${customPath}/buddy.plugin.zsh`)
+          log.success('Updated buddy zsh plugin')
+        }
+      }
+
+      log.success('Oh My Zsh setup complete.')
+      log.info('To see changes reflect, you may need to:')
+      log.info('⌘⇧P workbench.action.reloadWindow')
+    })
+
   buddy.on('setup:*', () => {
     console.error('Invalid command: %s\nSee --help for a list of available commands.', buddy.args.join(' '))
     process.exit(ExitCode.FatalError)

package/core/buddy/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

package/core/build/package.json

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

package/core/build/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

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

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/bud",
   "type": "module",
-  "version": "0.58.50",
+  "version": "0.58.52",
   "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.50",
+  "version": "0.58.52",
   "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.50",
+  "version": "0.58.52",
   "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.50",
+  "version": "0.58.52",
   "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.50",
+  "version": "0.58.52",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",
@@ -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",

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

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

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

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

package/core/cache/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cache",
   "type": "module",
-  "version": "0.58.50",
+  "version": "0.58.52",
   "description": "Caching the Stacks way.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cache/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

package/core/chat/package.json

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

package/core/chat/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

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.50";
+var version = "0.58.52";
 
 // src/cli.ts
 function cli(name, options) {

package/core/cli/package.json

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

package/core/cli/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}

package/core/cloud/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-await runCommand('bun build ./src/index.ts --outfile ./dist/index.js --outdir ./dist/ --external @aws-sdk/client-cloudformation --external @aws-sdk/client-cloudwatch-logs --external @aws-sdk/client-ec2 --external @aws-sdk/client-efs --external @aws-sdk/client-iam --external @aws-sdk/client-ssm --external @aws-sdk/lambda --external @aws-sdk/client-route-53-domains --external @aws-sdk/client-s3 --external @stacksjs/config --external @stacksjs/error-handling --external @stacksjs/logging --external @stacksjs/path --external @stacksjs/utils --external @stacksjs/strings --external aws-cdk-lib --external constructs --external @stacksjs/env --external @smithy/types --external @smithy/protocol-http --external @aws-sdk/middleware-logger --external @aws-sdk/middleware-recursion-detection --external @aws-sdk/middleware-host-header --external @smithy/property-provider --external @aws-crypto/crc32 --external @smithy/util-hex-encoding --external @smithy/smithy-client --external @smithy/signature-v4 --external @smithy/util-endpoints --external @aws-sdk/util-endpoints --external @smithy/util-middleware --external @aws-sdk/middleware-user-agent --external @smithy/util-config-provider --external @smithy/config-resolver --external @smithy/middleware-content-length --external @smithy/middleware-endpoint --external @smithy/util-retry --external @smithy/service-error-classification --external @smithy/middleware-retry --external @smithy/core --external @aws-sdk/core --external @smithy/middleware-serde --external fast-xml-parser --external @smithy/shared-ini-file-loader --external @smithy/credential-provider-imds --external @aws-sdk/credential-provider-env --external @aws-sdk/client-sso --external @aws-sdk/credential-provider-sso --external @aws-sdk/credential-provider-ini --external @aws-sdk/credential-provider-process --external @aws-sdk/credential-provider-web-identity --external universalify  --external graceful-fs --external fs-extra --external fast-glob --external kleur --external @stacksjs/cli --external @aws-sdk/middleware-signing --external @smithy/eventstream-serde-config-resolver --external @aws-sdk/client-lambda --target bun', {
+await runCommand('bun build ./src/index.ts --outfile ./dist/index.js --outdir ./dist/ --external @aws-sdk/client-cloudformation --external @aws-sdk/client-cloudwatch-logs --external @aws-sdk/client-ec2 --external @aws-sdk/client-efs --external @aws-sdk/client-iam --external @aws-sdk/client-ssm --external @aws-sdk/lambda --external @aws-sdk/client-route-53-domains --external @aws-sdk/client-s3 --external @stacksjs/config --external @stacksjs/error-handling --external @stacksjs/logging --external @stacksjs/path --external @stacksjs/utils --external @stacksjs/strings --external @stacksjs/storage --external aws-cdk-lib --external constructs --external @stacksjs/env --external @smithy/types --external @smithy/protocol-http --external @aws-sdk/middleware-logger --external @aws-sdk/middleware-recursion-detection --external @aws-sdk/middleware-host-header --external @smithy/property-provider --external @aws-crypto/crc32 --external @smithy/util-hex-encoding --external @smithy/smithy-client --external @smithy/signature-v4 --external @smithy/util-endpoints --external @aws-sdk/util-endpoints --external @smithy/util-middleware --external @aws-sdk/middleware-user-agent --external @smithy/util-config-provider --external @smithy/config-resolver --external @smithy/middleware-content-length --external @smithy/middleware-endpoint --external @smithy/util-retry --external @smithy/service-error-classification --external @smithy/middleware-retry --external @smithy/core --external @aws-sdk/core --external @smithy/middleware-serde --external fast-xml-parser --external @smithy/shared-ini-file-loader --external @smithy/credential-provider-imds --external @aws-sdk/credential-provider-env --external @aws-sdk/client-sso --external @aws-sdk/credential-provider-sso --external @aws-sdk/credential-provider-ini --external @aws-sdk/credential-provider-process --external @aws-sdk/credential-provider-web-identity --external universalify  --external graceful-fs --external fs-extra --external fast-glob --external kleur --external @stacksjs/cli --external @aws-sdk/middleware-signing --external @smithy/eventstream-serde-config-resolver --external @aws-sdk/client-lambda --target bun', {
   cwd: import.meta.dir,
 })
 

package/core/cloud/deploy.ts

@@ -12,7 +12,16 @@ import { getOrCreateTimestamp } from './src/helpers'
 import type { CloudOptions } from './src/types'
 
 const app = new App()
-const appEnv = config.app.env === 'local' ? 'dev' : config.app.env
+const appEnv = (config.app.env as string) === 'local'
+  ? 'dev'
+  : (config.app.env as string) === 'development'
+      ? 'dev'
+      : (config.app.env as string) === 'staging'
+          ? 'stage'
+          : (config.app.env as string) === 'production'
+              ? 'prod'
+              : config.app.env
+
 const appKey = config.app.key
 const domain = config.app.url
 const appName = config.app.name?.toLowerCase() ?? 'stacks'