Merge branch 'main' into ref-old-actions

brown-ccv · Dec 8, 2023 · 6126785 · 6126785
2 parents a6cb9c1 + 1cbb0d5
commit 6126785
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 444 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,7 @@ module.exports = {
   extends: [
     "eslint:recommended",
     "plugin:react/recommended",
-    // TODO 325: Add rules for import order
+    "plugin:import/recommended",
     "prettier",
   ],
   parserOptions: {
@@ -19,10 +19,17 @@ module.exports = {
   plugins: ["react"],
   rules: {
     "react/prop-types": "off", // TODO: These should be added so the rule can be removed
+    "import/order": "warn",
   },
   settings: {
     react: {
       version: "detect",
     },
+    "import/resolver": {
+      node: {
+        extensions: [".js", ".jsx"],
+      },
+    },
   },
+  overrides: [{ files: ["*.jsx", "*.js"] }],
 };
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -42,12 +42,14 @@ jobs:
           path: ./env
           mode: ${{matrix.setting}}
 
-      # Test and build the app
-      - name: 🧪 Run Test
+      # Test and lint
+      - name: 🧪 Test
         run: npm test
         env:
           CI: true
       - name: 🔬 Lint
-        run: npm run lint
-      - name: ⚒ Run Build
+        run: npm run lint -- --max-warnings=0
+
+      # Build the app
+      - name: ⚒ Build
         run: npm run build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
           mode: ${{matrix.setting}}
 
       # Build the app
-      - name: ⚒ Run Build
+      - name: ⚒ Build
         run: npm run build
 
       # Package the app installers
@@ -120,7 +120,7 @@ jobs:
         run: npm ci
 
       # Build the app
-      - name: ⚒ Run Build
+      - name: ⚒ Build
         run: npm run build
 
       # Deploy the app to GitHub Pages
@@ -155,7 +155,7 @@ jobs:
         run: pip install psiturk
 
       # Build the app
-      - name: ⚒ Run Build
+      - name: ⚒ Build
         run: npm run build
 
       # Get package info

diff --git a/.github/workflows/workflow-package.yml b/.github/workflows/workflow-package.yml
@@ -63,7 +63,7 @@ jobs:
           mode: ${{github.event.inputs.setting}}
 
       # Build the app
-      - name: ⚒ Run Build
+      - name: ⚒ Build
         run: npm run build
 
       # Package the app installers