chore: wip

Author: chrisbbreuer

storage/framework/core/actions/src/deploy/index.ts

@@ -31,7 +31,7 @@ await runCommand('bun build.ts', {
 })
 
 await runCommand('bun zip.ts', {
-  cwd: p.cloudPath(),
+  cwd: p.corePath('cloud'),
 })
 
 log.info('Preparing Deployment...')

storage/framework/core/cloud/src/cloud/compute.ts

@@ -56,7 +56,7 @@ export class ComputeStack {
     const container = this.taskDefinition.addContainer('WebServerContainer', {
       containerName: `${props.appName}-${props.appEnv}-api`,
       // image: ecs.ContainerImage.fromDockerImageAsset(assetImage),
-      image: ecs.ContainerImage.fromAsset(p.frameworkCloudPath()),
+      image: ecs.ContainerImage.fromAsset(p.frameworkPath('server')),
       logging: new ecs.AwsLogDriver({
         streamPrefix: `${props.appName}-${props.appEnv}-web-server-logs`,
         logGroup: new LogGroup(scope, 'StacksApiLogs', {

storage/framework/core/cloud/src/cloud/docs.ts

@@ -28,7 +28,7 @@ export class DocsStack {
       description: 'The Stacks Origin Request function that prettifies URLs',
       runtime: lambda.Runtime.NODEJS_18_X,
       handler: 'dist/origin-request.handler',
-      code: lambda.Code.fromAsset(p.frameworkCloudPath('dist.zip'), {
+      code: lambda.Code.fromAsset(p.cloudPath('dist.zip'), {
         assetHash: originRequestFunctionHash(),
         assetHashType: AssetHashType.CUSTOM,
       }),

storage/framework/core/cloud/src/cloud/queue.ts

@@ -47,7 +47,7 @@ export class QueueStack {
     for (const ormFile of ormActionFiles) {
       if (!ormFile.endsWith('.ts')) continue
 
-      const ormActionPath = path.builtUserActionsPath(ormFile)
+      const ormActionPath = path.builtUserActionsPath(`src/${ormFile}`)
 
       // Await the loading of the job module
       const ormAction = await this.loadModule(ormActionPath)

storage/framework/core/utils/src/clean.ts

@@ -11,5 +11,5 @@ export async function cleanProject() {
   await $`rm -rf ${p.frameworkPath('**/node_modules')}`
   await $`rm -rf ${p.frameworkCloudPath('cdk.out/')}`
   await $`rm -rf ${p.frameworkCloudPath('cdk.context.json')}`
-  await $`rm -rf ${p.frameworkCloudPath('dist.zip')}`
+  await $`rm -rf ${p.cloudPath('dist.zip')}`
 }

storage/framework/server/src/utils.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
 import { log, runCommand } from '@stacksjs/cli'
 import { app } from '@stacksjs/config'
-import { frameworkCloudPath, frameworkPath, projectPath } from '@stacksjs/path'
+import { cloudPath, frameworkCloudPath, frameworkPath, projectPath } from '@stacksjs/path'
 import { hasFiles } from '@stacksjs/storage'
 import { slug } from '@stacksjs/strings'
 import { $ } from 'bun'
@@ -45,7 +45,7 @@ export async function buildDockerImage() {
   log.success('Deleted old cdk.context.json')
 
   log.info('Deleting old dist.zip file...')
-  await runCommand(`rm -rf ${frameworkCloudPath('dist.zip')}`)
+  await runCommand(`rm -rf ${cloudPath('dist.zip')}`)
   log.success('Deleted old dist.zip')
 
   log.info('Deleting .DS_Store files...')