Merge pull request #4 from frontend-fun/update-branches

acbart · web-flow · commit 268363c2dba4 · 2024-08-20T13:23:26.000-04:00
Update branches
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -33,7 +33,7 @@ module.exports = {
         },
         project: ["./tsconfig.json"],
     },
-    ignorePatterns: [".eslintrc.js"],
+    ignorePatterns: [".eslintrc.js", "jest.config.js"],
     rules: {
         // https://stackoverflow.com/questions/57802057/eslint-configuring-no-unused-vars-for-typescript
         // Use typescript's checker for unused vars (critical for Enums)
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -80,6 +80,7 @@ jobs:
               run: |
                   echo "<html><body><pre>" > ./dist/build.html
                   npm run build |& tee -a ./dist/build.html
+                  mv ./build/* ./dist
                   echo "</pre></body></html>" >> ./dist/build.html
                   echo "* [Build](../build.html)" >> docs/quick-links.md
             # Run Tests
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,12 +5,9 @@
     "private": true,
     "dependencies": {
         "@testing-library/jest-dom": "^5.17.0",
-        "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "@types/jest": "^27.5.2",
         "@types/node": "^16.18.105",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.0",
         "react": "^18.3.1",
         "react-bootstrap": "^2.10.4",
         "react-dom": "^18.3.1",
@@ -48,6 +45,10 @@
     },
     "devDependencies": {
         "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/react": "^16.0.0",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
         "@typescript-eslint/eslint-plugin": "^8.2.0",
         "@typescript-eslint/parser": "^8.2.0",
         "eslint": "^8.57.0",
