update all the things

Author: kentcdodds

.eslintignore

@@ -19,12 +19,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: ▶️ Run setup script
         run: npm run setup
@@ -38,23 +38,20 @@ jobs:
   deploy:
     name: 🚀 Deploy
     runs-on: ubuntu-latest
-    # only deploy main branch on pushes
-    if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+    # only deploy main branch on pushes on non-forks
+    if:
+      ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' &&
+      github.repository_owner == 'epicweb-dev' }}
 
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      # move Dockerfile to root
-      - name: 🚚 Move Files
-        run: |
-          mv ./epicshop/fly.toml ./fly.toml
-          mv ./epicshop/Dockerfile ./Dockerfile
-          mv ./epicshop/.dockerignore ./.dockerignore
+      - name: 🎈 Setup Fly
+        uses: superfly/flyctl-actions/[email protected]
 
-      - name: 🚀 Deploy Production
-        uses: superfly/[email protected]
-        with:
-          args: 'deploy --remote-only'
+      - name: 🚀 Deploy
+        run: flyctl deploy --remote-only
+        working-directory: ./epicshop
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.github/workflows/validate.yml

@@ -15,8 +15,7 @@ ADD . .
 
 RUN npm install --omit=dev
 
-CMD node ./setup-swap.js && \
-    rm -rf ${EPICSHOP_CONTEXT_CWD} && \
+CMD rm -rf ${EPICSHOP_CONTEXT_CWD} && \
     git clone https://github.com/epicweb-dev/workshop-template ${EPICSHOP_CONTEXT_CWD} && \
     cd ${EPICSHOP_CONTEXT_CWD} && \
     npx epicshop start

.prettierignore

@@ -1,7 +1,7 @@
-import chokidar from 'chokidar'
 import path from 'node:path'
-import { $ } from 'execa'
 import { fileURLToPath } from 'node:url'
+import chokidar from 'chokidar'
+import { $ } from 'execa'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const here = (...p) => path.join(__dirname, ...p)

.prettierrc

@@ -1,8 +1,8 @@
 // This should run by node without any dependencies
 // because you may need to run it without deps.
 
-import fs from 'node:fs'
 import cp from 'node:child_process'
+import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -55,7 +55,7 @@ async function updatePkgNames() {
 	for (const file of appsWithPkgJson) {
 		const pkgjsonPath = path.join(file, 'package.json')
 		const pkg = JSON.parse(await fs.promises.readFile(pkgjsonPath, 'utf8'))
-		pkg.name = relativeToWorkshopRoot(file).replace(/\\|\//g, '__sep__')
+		pkg.name = relativeToWorkshopRoot(file).replace(/\\|\//g, '_')
 		const written = await writeIfNeeded(
 			pkgjsonPath,
 			`${JSON.stringify(pkg, null, 2)}\n`,

epicshop/deployed/Dockerfile renamed to epicshop/Dockerfile

@@ -3,6 +3,7 @@ primary_region = "sjc"
 kill_signal = "SIGINT"
 kill_timeout = 5
 processes = [ ]
+swap_size_mb = 512
 
 [experimental]
 allowed_public_ports = [ ]