feat: Version 4 Release

.eslintignore

@@ -12,7 +12,6 @@
 # Autogenerated files
 /public/lib/*
 **/participant_responses
-psiturkit/*_turk
 *.log
 *.log*
 

.eslintrc.js

@@ -10,6 +10,7 @@ module.exports = {
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:import/recommended",
+    "plugin:import/electron",
     "prettier",
   ],
   parserOptions: {
@@ -22,14 +23,8 @@ module.exports = {
     "import/order": "warn",
   },
   settings: {
-    react: {
-      version: "detect",
-    },
-    "import/resolver": {
-      node: {
-        extensions: [".js", ".jsx"],
-      },
-    },
+    react: { version: "detect" },
+    "import/resolver": { node: { extensions: [".js", ".jsx"] } },
   },
   overrides: [{ files: ["*.jsx", "*.js"] }],
 };

.github/workflows/firebase-hosting-merge.yml

@@ -2,7 +2,7 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on merge
-"on":
+on:
   push:
     branches:
       - main
@@ -11,10 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm ci && npm run build:firebase
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_CCV_HONEYCOMB }}"
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CCV_HONEYCOMB }}
           channelId: live
           projectId: ccv-honeycomb

.github/workflows/firebase-hosting-pull-request.yml

@@ -2,20 +2,19 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on PR
-"on": pull_request
+on: pull_request
 permissions:
   checks: write
   contents: read
   pull-requests: write
 jobs:
   build_and_preview:
-    if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
+    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm ci && npm run build:firebase
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_CCV_HONEYCOMB }}"
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CCV_HONEYCOMB }}
           projectId: ccv-honeycomb

.github/workflows/pull_request.yml

@@ -22,7 +22,7 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: npm

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: npm
@@ -52,16 +52,16 @@ jobs:
           path: ./env
           mode: ${{matrix.setting}}
 
-      # Package the app installers
-      - name: 📦 Package app installer - Windows
+      # Package the app and make the installers
+      - name: 📦 Make app installer - Windows
         if: startsWith(matrix.os, 'windows')
-        run: npm run package:windows
-      - name: 📦 Package app installer - Mac
+        run: npm run make:windows
+      - name: 📦 Make app installer - Mac
         if: startsWith(matrix.os, 'mac')
-        run: npm run package:mac
-      - name: 📦 Package app installer - Linux
+        run: npm run make:mac
+      - name: 📦 Make app installer - Linux
         if: startsWith(matrix.os, 'ubuntu')
-        run: npm run package:linux
+        run: npm run make:linux
 
       # Get package info
       - name: Get package name and version
@@ -72,6 +72,7 @@ jobs:
         shell: bash
 
       # Upload installers to GitHub release
+      # TODO @brown-ccv #247: Use the Publish command: https://www.electronforge.io/cli#publish
       - name: ⬆ Upload installer to release - Windows
         if: startsWith(matrix.os, 'windows')
         uses: svenstaro/upload-release-action@v2
@@ -96,89 +97,3 @@ jobs:
           asset_name: ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-${{ matrix.setting }}-amd64.deb
           tag: ${{ github.ref }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-
-  deploy-gh-pages:
-    name: Deploy to GH Pages
-    runs-on: ubuntu-latest
-    steps:
-      # Set up runner
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-      - name: 🐍 Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      # Install dependencies
-      - name: 📥 Install Dependencies
-        run: npm ci
-
-      # Build the app
-      - name: ⚒ Build
-        run: npm run build
-
-      # Deploy the app to GitHub Pages
-      - name: 🚀 Deploy to GH Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./build
-
-  package-psiturk:
-    name: Package for PsiTurk
-    runs-on: ubuntu-latest
-    steps:
-      # Set up runner
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-      - name: 🐍 Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      # Install dependencies
-      - name: 📥 Install Dependencies
-        run: npm ci
-      - name: 📥 Install PsiTurk
-        run: pip install psiturk
-
-      # Build the app
-      - name: ⚒ Build
-        run: npm run build
-
-      # Get package info
-      - name: Get package name and version
-        id: package_info
-        run: |
-          echo "name=$(cat package.json | jq -r '.name')" >> $GITHUB_OUTPUT
-          echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
-        shell: bash
-
-      # Package with PsiTurk
-      - name: 📦 Create Psiturk Build
-        run: |
-          cd psiturkit
-          ./psiturk-it -p ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-psiturk
-
-      # Zip and upload the package
-      - name: Zip psiturk folder
-        run: |
-          cd psiturkit
-          zip -r ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-psiturk.zip ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-psiturk
-      - name: ⬆ Upload PsiTurk Build
-        uses: svenstaro/upload-release-action@v2
-        with:
-          file: psiturkit/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-psiturk.zip
-          tag: ${{ github.ref }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/workflow-package.yml

@@ -1,6 +1,8 @@
 name: 📦 Package Workflow
 
 # Workflow dispatch for packaging an electron executable
+# TODO: Update actions running on Node 16 (all workflows)
+# TODO: Rename as workflow-make
 on:
   workflow_dispatch:
     inputs:
@@ -44,7 +46,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: npm
@@ -66,16 +68,16 @@ jobs:
           path: ./env
           mode: ${{github.event.inputs.setting}}
 
-      # Package the app installers
-      - name: 📦 Package app installer - Windows
+      # Package the app and make the installers
+      - name: 📦 Make app installer - Windows
         if: startsWith(matrix.os, 'windows')
-        run: npm run package:windows
-      - name: 📦 Package app installer - Mac
+        run: npm run make:windows
+      - name: 📦 Make app installer - Mac
         if: startsWith(matrix.os, 'mac')
-        run: npm run package:mac
-      - name: 📦 Package app installer - Linux
+        run: npm run make:mac
+      - name: 📦 Make app installer - Linux
         if: startsWith(matrix.os, 'ubuntu')
-        run: npm run package:linux
+        run: npm run make:linux
 
       # Get package info
       - name: Get package name and version
@@ -86,6 +88,7 @@ jobs:
         shell: bash
 
       # Upload installers to github action
+      # TODO @brown-ccv #247: Can we use the publish command here?
       - name: ⬆ Upload installer - Windows
         uses: actions/upload-artifact@v3
         if: startsWith(matrix.os, 'windows')

.gitignore

@@ -2,15 +2,19 @@
 
 # Dependencies
 /node_modules
-Brewfile.lock.json
 /.pnp
 .pnp.js
 .vite
 
+# Cache
+.npm
+.eslintcache
+
 # Testing
 /coverage
 
 # Production
+.vite
 /build
 /dist
 /out
@@ -19,6 +23,7 @@ Brewfile.lock.json
 /.vscode
 
 # Logs
+logs
 *.log
 *.log*
 
@@ -27,13 +32,12 @@ public/config/version.json
 public/version.json
 Brewfile.lock.json
 
-# Firebase private key
+# Secrets
 **/firebase-service-account.json
 
-# Live data
+# Data
 **/participant_responses
 
 # Misc
 .env
-.DS_Store
-psiturkit/*_turk
+.DS_Store