.github/workflows/api.yaml

@@ -20,11 +20,6 @@ jobs:
           sparse-checkout: |
             api
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: ${{ vars.PNPM_VERSION }}
-
       - name: Install Nest CLI
         run: |
           npm install -g @nestjs/cli
@@ -35,12 +30,14 @@ jobs:
           node-version: ${{ vars.NODE_VERSION }}
 
       - name: Install dependencies
+        working-directory: api
         run: |
-          pnpm install --frozen-lockfile
+          npm install --omit=dev
 
       - name: Build
+        working-directory: api
         run: |
-          pnpm --filter api build
+          npm run build
 
       - name: Log into Docker Hub
         uses: docker/login-action@v3

.github/workflows/app.yaml

@@ -19,24 +19,20 @@ jobs:
           sparse-checkout: |
             app
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: ${{ vars.PNPM_VERSION }}
-
       - name: 'Setup Node'
         uses: actions/setup-node@v4
         with:
           node-version: ${{ vars.NODE_VERSION }}
 
       - name: Install
+        working-directory: app
         run: |
-          pnpm install --frozen-lockfile
+          npm install --omit=dev
 
       - name: Build
         working-directory: app
         run: |
-          pnpm --filter app build
+          npm run build
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+# . "$(dirname -- "$0")/_/husky.sh"
 
-npx lint-staged
+# npx lint-staged

Dockerfile

@@ -11,10 +11,11 @@ RUN pnpm deploy --filter=api --prod /prod/api
 RUN pnpm deploy --filter=app --prod /prod/app
 
 FROM base AS api
-COPY --from=install /prod/api /prod/api
-WORKDIR /prod/api
+COPY ./api/dist ./api/dist
+COPY ./api/node_modules ./api/node_modules
 EXPOSE 3000
-CMD ["node", "dist/main.js"]
+CMD ["node", "/api/dist/main.js"]
+# CMD ["tail", "-f", "/dev/null"] 
 
 FROM base AS app
 ARG VITE_API_URL

package.json

@@ -1,11 +1,6 @@
 {
   "name": "@noahspan/flying",
   "version": "1.0.0",
-  "workspaces": [
-    "api",
-    "app",
-    "tests"
-  ],
   "scripts": {
     "start": "concurrently 'npm run start:azure -w api' 'wait-on tcp:0.0.0.0:7071 && npm run dev -w app'",
     "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",

pnpm-workspace.yaml

@@ -1,3 +0,0 @@
-packages:
-  - 'api'
-  - 'app'