Merge pull request #14 from BrianMitchL/update-deps

Update deps
BrianMitchL · Nov 2, 2020 · 1338922 · 1338922
2 parents 8e976dc + 2f94caf
commit 1338922
Show file tree

Hide file tree

Showing 7 changed files with 5,576 additions and 5,586 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,15 +28,15 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: run-${{ matrix.node-versio }}
+          flag-name: run-${{ matrix.node-version }}
           parallel: true
-          
+
   finish:
     needs: build-test
     runs-on: ubuntu-latest
     steps:
-    - name: Coveralls Finished
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        parallel-finished: true
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,28 +10,31 @@
     "@koale/useworker": "^3.2.1",
     "@reach/tabs": "^0.11.2",
     "@reach/visually-hidden": "^0.11.1",
-    "@types/jest": "^26.0.14",
-    "@types/node": "^12.12.62",
-    "@types/react": "^16.9.49",
-    "@types/react-dom": "^16.9.8",
+    "@types/jest": "^26.0.15",
+    "@types/node": "^12.19.3",
+    "@types/react": "^16.9.55",
+    "@types/react-dom": "^16.9.9",
     "gift-exchange": "^2.1.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "react-hook-form": "^6.8.3",
-    "react-scripts": "^3.4.3",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-hook-form": "^6.10.1",
+    "react-scripts": "^4.0.0",
     "typeface-inter": "^3.15.0",
-    "typescript": "~3.9.7"
+    "typescript": "~4.0.5"
   },
   "scripts": {
     "postinstall": "cpx 'node_modules/gift-exchange/dist/gift-exchange.umd.*' public",
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jest-environment-jsdom-sixteen",
+    "test": "react-scripts test",
     "predeploy": "npm run build",
     "deploy": "gh-pages -d build"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
   },
   "browserslist": {
     "production": [
@@ -46,15 +49,15 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.0.4",
-    "@testing-library/user-event": "^12.1.6",
+    "@testing-library/jest-dom": "^5.11.5",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
     "cpx": "^1.5.0",
     "gh-pages": "^3.1.0",
     "husky": "^4.3.0",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "prettier": "^2.1.2",
-    "pretty-quick": "^3.0.2"
+    "pretty-quick": "^3.1.0"
   },
   "prettier": {
     "singleQuote": true

diff --git a/src/Main.test.tsx b/src/Main.test.tsx
@@ -3,7 +3,7 @@ import { render, screen, queries, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { Main } from './Main';
 
-jest.mock('@koale/useworker', () => require('../__mocks__/@koale/useworker'));
+jest.mock('@koale/useworker', () => require('./useworker-mock'));
 
 beforeEach(() => {
   localStorage.clear();

diff --git a/src/index.tsx b/src/index.tsx
@@ -5,4 +5,9 @@ import 'typeface-inter';
 import './index.css';
 import App from './App';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+);
diff --git a/__mocks__/@koale/useworker.js → src/useworker-mock.js b/__mocks__/@koale/useworker.js → src/useworker-mock.js
@@ -1,8 +1,8 @@
 import { calculateSync } from 'gift-exchange';
 
-export const useWorker = jest.fn().mockImplementation(() => {
+export const useWorker = () => {
   const workerFn = async (people, exclusions) => {
     return calculateSync(people, exclusions).map((p, i) => [people[i], p]);
   };
   return [workerFn, { status: 'PENDING', kill: jest.fn() }];
-});
+};
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,11 +3,12 @@
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,