tweaking (#929)

Author: NiloCK

.github/workflows/deploy-express-backend.yml

@@ -46,6 +46,27 @@ jobs:
       - name: Build Express backend
         run: yarn workspace @vue-skuilder/express build
 
+      - name: Prepare package.json for deployment
+        working-directory: ./packages/express
+        run: |
+          # Create a deployment package.json with file: references for workspace deps
+          cat package.json | node -e "
+            const pkg = JSON.parse(require('fs').readFileSync(0, 'utf-8'));
+            pkg.dependencies['@vue-skuilder/common'] = 'file:./workspace/common';
+            pkg.dependencies['@vue-skuilder/db'] = 'file:./workspace/db';
+            console.log(JSON.stringify(pkg, null, 2));
+          " > package.json.deploy
+
+      - name: Install production dependencies
+        working-directory: ./packages/express
+        run: |
+          # Temporarily use the modified package.json
+          mv package.json package.json.orig
+          mv package.json.deploy package.json
+          NODE_ENV=production yarn install
+          # Restore original
+          mv package.json.orig package.json
+
       - name: Create build info
         run: |
           BUILD_INFO="Build created on $(date) from commit ${{ github.sha }}\n"
@@ -62,7 +83,8 @@ jobs:
 
           echo "Syncing Express package..."
           rsync -rl --delete ./packages/express/dist/ ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/dist
-          rsync -rl ./packages/express/package.json ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/
+          rsync -rl ./packages/express/package.json.deploy ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/package.json
+          rsync -rl ./packages/express/node_modules/ ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/node_modules
           rsync -rl ./packages/express/assets/ ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/assets
           rsync -rl ./packages/express/.env.production ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/.env.production
 
@@ -78,14 +100,6 @@ jobs:
           rsync -rl --delete ./packages/db/dist/ ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/workspace/db/dist
           rsync -rl ./packages/db/package.json ${{ secrets.DO_USERNAME }}@eduquilt.com:/home/skuilder/dist/express-backend/$newversion/workspace/db/
 
-          # Create a modified package.json with file: references for workspace deps
-          echo "Creating package.json with resolved workspace paths..."
-          ssh ${{ secrets.DO_USERNAME }}@eduquilt.com "cd /home/skuilder/dist/express-backend/$newversion && cat package.json | jq '.dependencies[\"@vue-skuilder/common\"] = \"file:./workspace/common\" | .dependencies[\"@vue-skuilder/db\"] = \"file:./workspace/db\"' > package.json.tmp && mv package.json.tmp package.json"
-
-          # Install express package dependencies (this will also link the workspace packages)
-          echo "Installing production dependencies on server..."
-          ssh ${{ secrets.DO_USERNAME }}@eduquilt.com "cd /home/skuilder/dist/express-backend/$newversion && source ~/.nvm/nvm.sh && NODE_ENV=production yarn install --immutable"
-
           echo "Setting symlink to new version..."
           ssh ${{ secrets.DO_USERNAME }}@eduquilt.com ln -sfn /home/skuilder/dist/express-backend/$newversion /home/skuilder/express-backend
           echo "Deployment complete to version $newversion"