Replace immutability-helper with immer

.eslintrc.js

@@ -100,6 +100,10 @@ module.exports = {
     "import/no-relative-packages": "off",
     "import/no-import-module-exports": "off",
     "no-use-before-define": "off",
+    "no-param-reassign": [
+      "error",
+      { props: true, ignorePropertyModificationsFor: ["draftState"] },
+    ],
     "@typescript-eslint/no-use-before-define": ["error"],
   },
 

package.json

@@ -38,7 +38,6 @@
     "flip-toolkit": "^7.1.0",
     "google-map-react": "^2.2.0",
     "history": "^5.3.0",
-    "immutability-helper": "^3.1.1",
     "isomorphic-style-loader": "^5.3.2",
     "jsonwebtoken": "^9.0.0",
     "lodash.get": "^4.4.2",

src/api/tests/decisions.test.ts

@@ -4,8 +4,7 @@
 import { expect } from "chai";
 import { SinonSpy, match, spy, stub } from "sinon";
 import bodyParser from "body-parser";
-import { Response } from "superagent";
-import request from "supertest";
+import request, { Response } from "supertest";
 import express, { Application, RequestHandler } from "express";
 import proxyquire from "proxyquire";
 import SequelizeMock from "sequelize-mock";

src/api/tests/user.test.ts

@@ -4,8 +4,7 @@
 import { expect } from "chai";
 import { SinonSpy, spy, stub } from "sinon";
 import bodyParser from "body-parser";
-import { Response } from "superagent";
-import request from "supertest";
+import request, { Response } from "supertest";
 import express, { Application } from "express";
 import proxyquire from "proxyquire";
 import SequelizeMock from "sequelize-mock";

src/api/tests/users.test.ts

@@ -4,8 +4,7 @@
 import { expect } from "chai";
 import { SinonSpy, SinonStub, match, spy, stub } from "sinon";
 import bodyParser from "body-parser";
-import { Response } from "superagent";
-import request from "supertest";
+import request, { Response } from "supertest";
 import express, { Application, RequestHandler } from "express";
 import proxyquire from "proxyquire";
 import SequelizeMock from "sequelize-mock";

src/components/ConfirmModal/ConfirmModalContainer.ts

@@ -6,7 +6,7 @@ import { Dispatch, State } from "../../interfaces";
 const modalName = "confirm";
 
 const mapStateToProps = (state: State) => ({
-  actionLabel: state.modals[modalName].actionLabel,
+  actionLabel: state.modals[modalName].actionLabel!,
   body: state.modals[modalName].body,
   action: state.modals[modalName].action,
   shown: !!state.modals[modalName].shown,
@@ -24,7 +24,7 @@ const mergeProps = (
   ...stateProps,
   ...dispatchProps,
   handleSubmit: () => {
-    dispatchProps.dispatch(stateProps.action);
+    dispatchProps.dispatch(stateProps.action!);
     dispatchProps.hideModal();
   },
 });

src/interfaces.ts

@@ -389,6 +389,10 @@ export type Action =
       name: "confirm";
       opts: ConfirmOpts;
     }
+  | {
+      type: "SHOW_MODAL";
+      name: string;
+    }
   | {
       type: "HIDE_MODAL";
       name: string;
@@ -486,9 +490,11 @@ interface BaseState {
   notifications: Notification[];
   modals: {
     [index: string]: {
-      action: () => void;
-      actionLabel: string;
-      body: ReactNode;
+      action?:
+        | Action
+        | ThunkAction<Promise<void> | void, State, unknown, Action>;
+      actionLabel?: string;
+      body?: ReactNode;
       restaurantId?: number;
       shown: boolean;
     };

src/middlewares/tests/invitation.test.ts

@@ -4,9 +4,8 @@
 import { expect } from "chai";
 import { SinonSpy, match, spy, stub } from "sinon";
 import bodyParser from "body-parser";
-import { Response } from "superagent";
-import request from "supertest";
-import express, { Application, RequestHandler } from "express";
+import request, { Response } from "supertest";
+import express, { Application } from "express";
 import session, { Session } from "express-session";
 import proxyquire from "proxyquire";
 import SequelizeMock from "sequelize-mock";

src/middlewares/tests/login.test.ts

@@ -3,8 +3,7 @@
 
 import { expect } from "chai";
 import { SinonSpy, SinonStub, match, spy, stub } from "sinon";
-import { Response } from "superagent";
-import request from "supertest";
+import request, { Response } from "supertest";
 import express, { Application, NextFunction, RequestHandler } from "express";
 import proxyquire from "proxyquire";
 import mockEsmodule from "../../../test/mockEsmodule";