Merge pull request #9 from fresh-app/2024

2024

.github/workflows/factory.yml

@@ -24,7 +24,6 @@ jobs:
           - fresh-playwright-project
           - fresh-react-app-typescript
           - fresh-react-app
-          - fresh-remix-app-vercel
           - fresh-remix-app
           - fresh-solid-app-ts
           - fresh-sveltekit-app-typescript
@@ -45,28 +44,30 @@ jobs:
           - fresh-vitepress-site
           - fresh-vscode-extension
           - fresh-vscode-web-extension
-          - fresh-yarn-pnp-project
+
+          # Removed from the factory on 2024-01-31 due Remix no longer has a special Vercel config in their setup wizard.
+          # - fresh-remix-app-vercel
+
+          # Removed from the factory on 2024-01-31 due to lack of maintenance from my side (I have since switched to using pnpm).
+          # - fresh-yarn-pnp-project
 
           # Removed from the factory on 2023-03-19 because the generator script fails very often.
           # - fresh-redwood-app-typescript
           # - fresh-redwood-app
 
-          # Removed from the factory on 2021-03-19 because the generator script fails on
-          # recent Node.js versions and the generator is not maintained anymore
-          # (no updates since 2020-10-13).
+          # Removed from the factory on 2021-03-19 because the generator script fails on recent Node.js versions and the generator is not maintained anymore (no updates since 2020-10-13).
           # See: https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported)
           # - fresh-tsdx-lib
           # - fresh-tsdx-react-component-with-storybook
           # - fresh-tsdx-react-component
 
-          # Removed from the factory on 2021-03-19 because the generator script does not
-          # support Node.js v18.
+          # Removed from the factory on 2021-03-19 because the generator script does not support Node.js v18.
           # See: https://github.com/microsoft/rushstack/issues/4017
           # - fresh-rush-monorepo
     env:
       BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: docker/setup-buildx-action@v1
       - uses: docker/build-push-action@v2
         with:
@@ -82,21 +83,22 @@ jobs:
           TOKEN="$(npx obtain-github-app-installation-access-token ci ${{ secrets.GH_APP_CREDENTIALS_TOKEN }})"
           echo "::add-mask::$TOKEN"
           echo "::set-output name=token::$TOKEN"
-
-      - uses: actions/setup-node@v1
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - run: yarn
+          cache: 'pnpm'
+          node-version: '20'
+      - run: pnpm install
       - run: bin/run ${{ matrix.generator }}
-      - run: yarn node provision ${{ matrix.generator }}
+      - run: node provision ${{ matrix.generator }}
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}
       - run: bash sync.sh
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}
-      - run: yarn factory upload-result
+      - run: pnpm factory upload-result
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}

.github/workflows/lint.yml

@@ -8,9 +8,11 @@ jobs:
     name: Linting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - uses: actions/checkout@v2
-      - run: yarn
-      - run: yarn tsc
+          cache: 'pnpm'
+          node-version: '20'
+      - run: pnpm install
+      - run: pnpm tsc

.github/workflows/manual.yml

@@ -34,20 +34,22 @@ jobs:
           echo "::add-mask::$TOKEN"
           echo "::set-output name=token::$TOKEN"
 
-      - uses: actions/setup-node@v1
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - run: yarn
+          cache: 'pnpm'
+          node-version: '20'
+      - run: pnpm install
       - run: bin/run ${{ github.event.inputs.generator }}
-      - run: yarn node provision ${{ github.event.inputs.generator }}
+      - run: node provision ${{ github.event.inputs.generator }}
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}
       - run: bash sync.sh
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}
-      - run: yarn factory upload-result
+      - run: pnpm factory upload-result
         if: '!inputs.dry-run'
         env:
           GH_PUSH_TOKEN: ${{ steps.githubAppAuth.outputs.token }}

.github/workflows/tidy.yml

@@ -8,11 +8,13 @@ jobs:
     name: Ensure codebase is tidy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - uses: actions/checkout@v2
-      - run: yarn
-      - run: yarn prettier --write .
+          cache: 'pnpm'
+          node-version: '20'
+      - run: pnpm install
+      - run: pnpm prettier --write .
       - run: git add --update
       - uses: dtinth/patch-generator-action@main

.prettierignore

@@ -1,2 +1,3 @@
 /.pnp.cjs
-/.yarn/
+/.yarn/
+pnpm-lock.yaml

.tool-versions

@@ -1 +1 @@
-nodejs 16.19.0
+nodejs 20.11.0

README.md

@@ -27,14 +27,14 @@ This project aims to make it easier for developers to get started with new app f
 
 ### Prerequisites
 
-- Node.js and Yarn
+- Node.js and Corepack
 - Docker
 
 ### Setup
 
 ```sh
 # Install dependencies
-yarn
+pnpm install
 
 # Build docker image
 bin/build

bin/build

@@ -1,2 +1,3 @@
 #!/bin/bash -e
 docker build -t factory-runner runner
+docker build -t factory-screenshotter screenshotter

bin/run

@@ -1,2 +1,2 @@
 #!/bin/bash -e
-yarn factory run -g "$1"
+pnpm factory run -g "$1"

bin/runner

@@ -5,6 +5,7 @@ exec docker run \
   -v "$PWD:/opt/factory:ro" \
   -ti \
   --ipc=host \
+  --network=host \
   --hostname=factory \
   --tmpfs=/tmp \
   factory-runner \

bin/screenshot

@@ -6,4 +6,5 @@ if [ ! -d "/ms-playwright/" ]; then
 fi
 
 set -x
-start-test "$1" :"$2" "cd /workspace && (playwright screenshot --viewport-size=1280,720 http://localhost:$2 /workspace/screenshot.png; playwright screenshot --viewport-size=1280,720 --wait-for-timeout=4096 http://localhost:$2 /workspace/screenshot.png)"
+playwright screenshot --viewport-size=1280,720 "$1" /workspace/screenshot.png
+playwright screenshot --viewport-size=1280,720 --wait-for-timeout=4096 "$1" /workspace/screenshot.png

bin/screenshotter

@@ -0,0 +1,12 @@
+#!/bin/bash -e
+docker rm -f factory-screenshotter-instance >/dev/null 2>&1
+exec docker run \
+  --name=factory-screenshotter-instance \
+  -v "$PWD:/opt/factory:ro" \
+  -ti \
+  --ipc=host \
+  --network=host \
+  --hostname=factory \
+  --tmpfs=/tmp \
+  factory-screenshotter \
+  "$@"

hacktoberfest.mjs

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process'
 
-const list = execSync('yarn factory list --json').toString()
+const list = execSync('pnpm factory list --json').toString()
 let n = 0
 const task = (text) => {
   const id = ++n

package.json

@@ -14,14 +14,18 @@
     "shelljs": "^0.8.5",
     "tsx": "^3.9.0",
     "typescript": "^4.8.4",
+    "wait-on": "^7.2.0",
     "xterm-addon-serialize": "^0.8.0",
     "xterm-headless": "^5.0.0"
   },
   "scripts": {
     "factory": "tsx src/main.ts"
   },
-  "packageManager": "[email protected]",
   "engines": {
-    "node": "16.x"
+    "node": "20.x"
+  },
+  "packageManager": "[email protected]+sha256.245fe901f8e7fa8782d7f17d32b6a83995e2ae03984cb5b62b8949bfdc27c7b5",
+  "devDependencies": {
+    "@types/wait-on": "^5.3.4"
   }
 }