chore: wip

chore: wip

chore: wip

chore: wip

.github/workflows/ci.yml

@@ -79,9 +79,6 @@ jobs:
       - name: Install dependencies
         run: bun install
 
-      - name: Set Application Key
-        run: bun buddy key:generate
-
       - name: Typecheck
         run: bun buddy test:types
 
@@ -111,9 +108,6 @@ jobs:
       - name: Install Dependencies
         run: bun install
 
-      - name: Set Application Key
-        run: bun buddy key:generate
-
       - name: Test Suite
         run: bun --bun run test
 

.github/workflows/release.yml

@@ -37,9 +37,6 @@ jobs:
       - name: Install Dependencies
         run: bun install
 
-      - name: Set Application Key
-        run: bun buddy key:generate
-
       - name: Prepublish # these packages are required for the "Publish framework" step
         run: bunx pnpm --filter='./storage/framework' build
 

storage/framework/core/env/src/types.ts

@@ -1,6 +1,6 @@
 import type { Infer, VineBoolean, VineEnum, VineNumber, VineString } from '@stacksjs/validation'
 import { validator } from '@stacksjs/validation'
-import env from '../../../../../config/env'
+import env from 'config/env'
 import type { EnvKey } from '../../../env'
 
 // import type { Validate } from '@stacksjs/validation'

storage/framework/server/.gitignore

@@ -1,4 +1,6 @@
 bootstrap
 *bun-build
+app
 routes
 config
+env.ts

storage/framework/server/Dockerfile

@@ -25,8 +25,13 @@ RUN cd /temp/prod && bun install
 # copy node_modules from temp directory
 # then copy all (non-ignored) project files into the image
 FROM base AS prerelease
-COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
+COPY --from=install /temp/dev/node_modules ./node_modules
+COPY ./app ./app
+COPY ./config ./config
+COPY ./routes ./routes
+COPY ./index.ts ./index.ts
+COPY ./package.json ./package.json
+COPY ./tsconfig.json ./tsconfig.json
 
 # [optional] tests & build
 # ENV NODE_ENV=production
@@ -35,10 +40,13 @@ COPY . .
 
 # copy production dependencies and source code into final image
 FROM base AS release
-COPY --from=install /temp/prod/node_modules node_modules
-COPY --from=prerelease /usr/src/app/index.ts .
-COPY --from=prerelease /usr/src/app/package.json .
-COPY --from=prerelease /usr/src/app/routes .
+COPY --from=install /temp/prod/node_modules ./node_modules
+COPY --from=prerelease /usr/src/app/index.ts ./index.ts
+COPY --from=prerelease /usr/src/app/tsconfig.json ./tsconfig.json
+COPY --from=prerelease /usr/src/app/package.json ./package.json
+COPY --from=prerelease /usr/src/app/routes ./routes
+COPY --from=prerelease /usr/src/app/config ./config
+COPY --from=prerelease /usr/src/app/app ./app
 
 # run the app
 USER bun

storage/framework/server/build.ts

@@ -21,10 +21,24 @@ else {
   log.info('Using default server configuration')
 }
 
-await runCommand(`cp -r ../../../config ./config`, {
+await runCommand(`rm -rf ${frameworkPath('server/config')}/*`, {
   cwd: frameworkPath('server'),
 })
-await runCommand(`cp -r ../../../routes ./routes`, {
+await runCommand(`cp -r ${projectPath('config')} ${frameworkPath('server/config')}`, {
+  cwd: frameworkPath('server'),
+})
+
+await runCommand(`rm -rf ${frameworkPath('server/routes')}/*`, {
+  cwd: frameworkPath('server'),
+})
+await runCommand(`cp -r ${projectPath('routes')} ${frameworkPath('server/routes')}`, {
+  cwd: frameworkPath('server'),
+})
+
+await runCommand(`rm -rf ${frameworkPath('server/app')}/*`, {
+  cwd: frameworkPath('server'),
+})
+await runCommand(`cp -r ${projectPath('app')} ${frameworkPath('server/app')}`, {
   cwd: frameworkPath('server'),
 })
 

storage/framework/server/index.ts

@@ -7,7 +7,9 @@ if (process.env.QUEUE_WORKER) {
   if (!process.env.JOB)
     throw new Error('Missing JOB environment variable')
 
-  const jobModule = await import(p.jobsPath('DummyJob'))
+  const jobModule = await import('./app/Jobs/DummyJob.ts')
+  // eslint-disable-next-line no-console
+  console.log('Running job', process.env.JOB)
   await jobModule.default.handle()
   process.exit(0)
 }

storage/framework/server/package.json

@@ -1,13 +1,13 @@
 {
   "name": "stacks-cloud",
   "type": "module",
-  "version": "0.58.28",
+  "version": "0.58.55",
   "scripts": {
     "build": "bun build.ts"
   },
   "dependencies": {
-    "@stacksjs/path": "^0.58.54",
-    "@stacksjs/router": "^0.58.54",
+    "@stacksjs/queue": "^0.58.55",
+    "@stacksjs/router": "^0.58.55",
     "aws4fetch": "^1.0.17"
   }
 }

storage/framework/server/tsconfig.json

@@ -0,0 +1,50 @@
+{
+  "compilerOptions": {
+    "incremental": true,
+    "target": "esnext",
+    "jsx": "preserve",
+    "lib": [
+      "esnext"
+    ],
+    "moduleDetection": "force",
+    "baseUrl": ".",
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "paths": {
+      "@stacksjs/*": ["../core/*/src"],
+      "stacks/*": ["../core/*/src"],
+      "buddy": ["../core/buddy/src/index.ts"],
+      "buddy/*": ["../core/buddy/src/*"],
+      "config/*": ["./config/*"],
+      "../../../env": ["./env.ts"]
+    },
+    "resolveJsonModule": true,
+    "types": [
+      "vite/client",
+      // "vue/ref-macros",
+      "vite-plugin-pages/client",
+      "vite-plugin-pwa/client",
+      "vite-plugin-vue-layouts/client",
+      "@intlify/unplugin-vue-i18n/messages"
+    ],
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./dist/types",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "./*.ts",
+    "./*.d.ts"
+  ]
+}