chore: wip

Author: chrisbbreuer

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

@@ -83,7 +83,7 @@ export function dev(buddy: CLI) {
         log.info('buddy dev:components result', result)
 
       if (result.isErr()) {
-        await outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error ?? undefined)
+        await outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
         process.exit()
       }
 
@@ -111,7 +111,7 @@ export function dev(buddy: CLI) {
 
       // check if result is an error
       else if (result.isErr()) {
-        await outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error ?? undefined)
+        await outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
         process.exit()
       }
 

.stacks/core/cloud/deploy.js

@@ -1,16 +1,31 @@
 #!/usr/bin/env node
 import * as cdk from 'aws-cdk-lib'
 import { app as a, services as s } from '@stacksjs/config'
-import { env } from '@stacksjs/env'
+import { projectPath } from '@stacksjs/path'
+import { env, loadEnv } from '@stacksjs/env'
 import { StacksCloud } from './src/cloud.js'
 
+// console.log('env', )
+
 const app = new cdk.App()
-const cloudName = `StacksCloud`
+const cloudName = `stacks-cloud`
+let accountId = env.AWS_ACCOUNT_ID;
+let region = env.AWS_DEFAULT_REGION;
+
+if (!accountId || !region) {
+  console.log('Missing accountId or region in config, fetching from AWS')
+  console.log('envenv', env)
+  process.exit(1)
+  // Fetch accountId and region here
+}
+
+let bucketName = `stacks-cloud-${a.env}-assets-${accountId}-${region}`;
 
 console.log('env', process.env)
 
 // eslint-disable-next-line no-new
 new StacksCloud(app, cloudName, {
+  // toolkitStackName: `${cloudName}-toolkit`,
   description: 'This stack includes all of your Stacks cloud resources.',
   env: {
     account: s.aws?.accountId,
@@ -19,7 +34,7 @@ new StacksCloud(app, cloudName, {
   },
   synthesizer: new cdk.DefaultStackSynthesizer({
     qualifier: a.env,
-    fileAssetsBucketName: 'stacks-cloud-${Qualifier}-assets-${AWS::AccountId}-${AWS::Region}',
+    fileAssetsBucketName: bucketName,
     bucketPrefix: '',
   }),
 })

.stacks/core/cloud/package.json

@@ -60,6 +60,7 @@
     "constructs": "^10.2.69"
   },
   "devDependencies": {
-    "@stacksjs/development": "workspace:*"
+    "@stacksjs/development": "workspace:*",
+    "@stacksjs/env": "workspace:*"
   }
 }

.stacks/core/cloud/src/cloud.js

@@ -1,4 +1,4 @@
-import { app } from '@stacksjs/config'
+import { app, security } from '@stacksjs/config'
 // import { publicPath } from '@stacksjs/path'
 import {
   Duration,
@@ -65,24 +65,7 @@ export class StacksCloud extends Stack {
         cloudWatchMetricsEnabled: true,
         metricName: 'webAclMetric',
       },
-      rules: [
-        {
-          action: { block: {} },
-          name: 'RateLimitRule',
-          priority: 0,
-          statement: {
-            rateBasedStatement: {
-              aggregateKeyType: 'IP',
-              limit: 2000,
-            },
-          },
-          visibilityConfig: {
-            sampledRequestsEnabled: true,
-            cloudWatchMetricsEnabled: true,
-            metricName: 'rateLimitRuleMetric',
-          },
-        },
-      ],
+      rules: security.appFirewall.rules,
     })
 
     const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, 'OAI')

.stacks/core/env/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm', {
+const result = await runCommand('bun build ./src/index.ts --external vite --outdir dist --format esm', {
   cwd: import.meta.dir,
 })
 

.stacks/core/env/package.json

@@ -45,6 +45,7 @@
     "prepublishOnly": "bun --bun run build"
   },
   "devDependencies": {
-    "@stacksjs/development": "workspace:*"
+    "@stacksjs/development": "workspace:*",
+    "@stacksjs/path": "workspace:*"
   }
 }

.stacks/core/env/src/index.ts

@@ -1,4 +1,6 @@
 import process from 'node:process'
+import { loadEnv } from 'vite'
+import { projectPath } from '@stacksjs/path'
 
 export interface Env {
   APP_NAME: string
@@ -121,6 +123,24 @@ export interface FrontendEnv {
 export type EnvKeys = keyof Env
 export type FrontendEnvKeys = keyof FrontendEnv
 
-export const env: Partial<Env> = process.env
+const handler = {
+  get(target: NodeJS.ProcessEnv, prop: string) {
+    console.log('get is called', prop)
+    process.env = loadEnv(process.env.NODE_ENV || 'development', projectPath(), '')
+    return target[prop];
+  }
+};
+
+export { loadEnv }
+
+// env('APP_NAME', 'Stacks')
+// env().APP_NAME
+// env.APP_NAME
+// config.app.name
+
+// export function env(key?: EnvKeys): string {
+//   return process.env[key] ?? process.env
+// }
+
+export const env: Partial<Env> = new Proxy(process.env, handler); // fancy way to not have to call env() everywhere
 
-// export { loadEnv } from 'vite'

.stacks/core/types/src/security.ts

@@ -13,7 +13,7 @@ export interface SecurityOptions {
     rules: {
       name: string
       priority: number
-      action: 'allow' | 'block'
+      action: { block?: {}, allow?: {} }
       visibilityConfig: {
         sampledRequestsEnabled: boolean
         cloudWatchMetricsEnabled: boolean

bun.lockb

@@ -9,10 +9,10 @@ import { env } from '@stacksjs/env'
  * you have any questions, feel free to reach out via Discord or GitHub Discussions.
  */
 export default {
-  name: env.APP_NAME ?? 'Stacks',
-  env: env.APP_ENV ?? 'development',
-  url: env.APP_URL ?? 'stacks.test',
-  debug: env.APP_DEBUG ?? false,
+  name: env.APP_NAME || 'Stacks',
+  env: env.APP_ENV || 'development',
+  url: env.APP_URL || 'stacks.test',
+  debug: env.APP_DEBUG || false,
   key: env.APP_KEY,
 
   timezone: 'UTC',