Merge patch commit

.env

@@ -1,6 +1,6 @@
 BROWSER=none
-VITE_API_ROOT=https://farmhand.vercel.app/
-VITE_NAME=$npm_package_name
-VITE_FARMHAND_PACKAGE_VERSION=$npm_package_version
-VITE_TURN_USERNAME=
-VITE_TURN_CREDENTIAL=
+REACT_APP_API_ROOT=https://farmhand.vercel.app/
+REACT_APP_NAME=$npm_package_name
+REACT_APP_VERSION=$npm_package_version
+REACT_APP_TURN_USERNAME=
+REACT_APP_TURN_CREDENTIAL=

.eslintrc.json

@@ -1,7 +1,4 @@
 {
-  "globals": {
-    "vitest": true
-  },
   "extends": ["react-app"],
   "rules": {
     "import/order": [

.github/workflows/ci.yml

@@ -24,7 +24,14 @@ jobs:
         run: npm ci
 
       - name: 'Run tests'
-        run: npm test -- --coverage --run
+        run: npm test -- --reporters=default --reporters=jest-junit
+
+      - name: Test Report
+        uses: dorny/test-reporter@v1
+        with:
+          name: Jest Tests # Name of the check run which will be created
+          path: reports/jest-*.xml # Path to test results
+          reporter: jest-junit # Format of test results
 
       - name: 'Check types'
         # TODO: Change this to check:types when all type errors are fixed
@@ -37,4 +44,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: build-output
-          path: dist
+          path: build

.github/workflows/run-release.yml

@@ -61,13 +61,13 @@ jobs:
           tags: true
           branch: main
 
-      - run: npm run build -- --base="./"
+      - run: PUBLIC_URL='./' npm run build
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Prepare Web Artifacts
-        run: zip farmhand-web-${{ env.PACKAGE_VERSION }}.zip -r dist/*
+        run: zip farmhand-web-${{ env.PACKAGE_VERSION }}.zip -r build/*
 
       - name: Create Release
         id: create_release
@@ -82,26 +82,26 @@ jobs:
           files: |
             ./farmhand-web-${{ env.PACKAGE_VERSION }}.zip
 
-      - run: node -e "console.log(require('./package.json').version)" > dist/version.txt
+      - run: node -e "console.log(require('./package.json').version)" > build/version.txt
       - name: Publish itch.io build
         uses: josephbmanley/butler-publish-itchio-action@master
         env:
           BUTLER_CREDENTIALS: ${{ secrets.ITCH_TOKEN }}
           CHANNEL: html5
           ITCH_GAME: Farmhand
           ITCH_USER: jeremyckahn
-          PACKAGE: dist
-          VERSION_FILE: dist/version.txt
+          PACKAGE: build
+          VERSION_FILE: build/version.txt
 
       - run: |
-          npm run build -- --base='/farmhand'
+          PUBLIC_URL='/farmhand' npm run build
 
       # https://github.com/marketplace/actions/deploy-to-github-pages
       - name: Deploy to jeremyckahn.github.io/farmhand
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
-          folder: dist
+          folder: build
           clean: true
           single-commit: true
 

.gitignore

@@ -4,6 +4,5 @@ build
 Session.vim
 .DS_Store
 .idea
-coverage
 
 .vercel

README.md

@@ -56,7 +56,7 @@ Farmhand uses a [SemVer](https://semver.org/)-like versioning system. It differs
 
 ## Project overview
 
-- This project uses [Vite](https://vitejs.dev/), so please refer to the documentation of that project to learn about the development toolchain.
+- This project is built with [Create React App](https://create-react-app.dev/), so please refer to the documentation of that project to learn about the development toolchain.
 - Farmhand uses [Piskel](https://www.piskelapp.com/) for the art assets.
 
 ## Running locally
@@ -138,13 +138,13 @@ The process will take several minutes to complete and it will notify the Discord
 Farmhand supports feature flags for code that should only be enabled in specific environments. To create a feature flag, add a line that looks like this in the relevant `.env` file:
 
 ```
-VITE_ENABLE_[FEATURE_NAME]=true
+REACT_APP_ENABLE_[FEATURE_NAME]=true
 ```
 
 Where `[FEATURE_NAME]` is replaced with the name of your feature. So, adding this to `.env.development.local`:
 
 ```
-VITE_ENABLE_MINING=true
+REACT_APP_ENABLE_MINING=true
 ```
 
 Would enable the `MINING` feature only for the local development environment. You can access the enabled feature flags at runtime by `import`ing the `features` Object from [`config.js`](https://github.com/jeremyckahn/farmhand/blob/develop/src/config.js). See [Adding Custom Environment Variables](https://create-react-app.dev/docs/adding-custom-environment-variables/) for more information on how to use environment variables.