Migrate to Redux Toolkit part 1

package.json

@@ -32,6 +32,7 @@
     "@blueprintjs/popover2": "^2.0.0",
     "@blueprintjs/select": "^5.0.0",
     "@octokit/rest": "^20.0.0",
+    "@reduxjs/toolkit": "^1.9.7",
     "@sentry/browser": "^7.57.0",
     "@sourceacademy/sharedb-ace": "^2.0.2",
     "@sourceacademy/sling-client": "^0.1.0",

src/commons/application/actions/InterpreterActions.ts

@@ -1,5 +1,5 @@
+import { createAction } from '@reduxjs/toolkit';
 import { SourceError, Value } from 'js-slang/dist/types';
-import { action } from 'typesafe-actions';
 
 import { WorkspaceLocation } from '../../workspace/WorkspaceTypes';
 import {
@@ -16,41 +16,66 @@ import {
   HANDLE_CONSOLE_LOG
 } from '../types/InterpreterTypes';
 
-export const handleConsoleLog = (workspaceLocation: WorkspaceLocation, ...logString: string[]) =>
-  action(HANDLE_CONSOLE_LOG, { logString, workspaceLocation });
+export const handleConsoleLog = createAction(
+  HANDLE_CONSOLE_LOG,
+  (workspaceLocation: WorkspaceLocation, ...logString: string[]) => ({
+    payload: { logString, workspaceLocation }
+  })
+);
 
-export const evalInterpreterSuccess = (value: Value, workspaceLocation: WorkspaceLocation) =>
-  action(EVAL_INTERPRETER_SUCCESS, { type: 'result', value, workspaceLocation });
+export const evalInterpreterSuccess = createAction(
+  EVAL_INTERPRETER_SUCCESS,
+  (value: Value, workspaceLocation: WorkspaceLocation) => ({
+    payload: { type: 'result', value, workspaceLocation }
+  })
+);
 
-export const evalTestcaseSuccess = (
-  value: Value,
-  workspaceLocation: WorkspaceLocation,
-  index: number
-) => action(EVAL_TESTCASE_SUCCESS, { type: 'result', value, workspaceLocation, index });
+export const evalTestcaseSuccess = createAction(
+  EVAL_TESTCASE_SUCCESS,
+  (value: Value, workspaceLocation: WorkspaceLocation, index: number) => ({
+    payload: { type: 'result', value, workspaceLocation, index }
+  })
+);
 
-export const evalTestcaseFailure = (
-  value: Value,
-  workspaceLocation: WorkspaceLocation,
-  index: number
-) => action(EVAL_TESTCASE_FAILURE, { type: 'errors', value, workspaceLocation, index });
+export const evalTestcaseFailure = createAction(
+  EVAL_TESTCASE_FAILURE,
+  (value: Value, workspaceLocation: WorkspaceLocation, index: number) => ({
+    payload: { type: 'errors', value, workspaceLocation, index }
+  })
+);
 
-export const evalInterpreterError = (errors: SourceError[], workspaceLocation: WorkspaceLocation) =>
-  action(EVAL_INTERPRETER_ERROR, { type: 'errors', errors, workspaceLocation });
+export const evalInterpreterError = createAction(
+  EVAL_INTERPRETER_ERROR,
+  (errors: SourceError[], workspaceLocation: WorkspaceLocation) => ({
+    payload: { type: 'errors', errors, workspaceLocation }
+  })
+);
 
-export const beginInterruptExecution = (workspaceLocation: WorkspaceLocation) =>
-  action(BEGIN_INTERRUPT_EXECUTION, { workspaceLocation });
+export const beginInterruptExecution = createAction(
+  BEGIN_INTERRUPT_EXECUTION,
+  (workspaceLocation: WorkspaceLocation) => ({ payload: { workspaceLocation } })
+);
 
-export const endInterruptExecution = (workspaceLocation: WorkspaceLocation) =>
-  action(END_INTERRUPT_EXECUTION, { workspaceLocation });
+export const endInterruptExecution = createAction(
+  END_INTERRUPT_EXECUTION,
+  (workspaceLocation: WorkspaceLocation) => ({ payload: { workspaceLocation } })
+);
 
-export const beginDebuggerPause = (workspaceLocation: WorkspaceLocation) =>
-  action(BEGIN_DEBUG_PAUSE, { workspaceLocation });
+export const beginDebuggerPause = createAction(
+  BEGIN_DEBUG_PAUSE,
+  (workspaceLocation: WorkspaceLocation) => ({ payload: { workspaceLocation } })
+);
 
-export const endDebuggerPause = (workspaceLocation: WorkspaceLocation) =>
-  action(END_DEBUG_PAUSE, { workspaceLocation });
+export const endDebuggerPause = createAction(
+  END_DEBUG_PAUSE,
+  (workspaceLocation: WorkspaceLocation) => ({ payload: { workspaceLocation } })
+);
 
-export const debuggerResume = (workspaceLocation: WorkspaceLocation) =>
-  action(DEBUG_RESUME, { workspaceLocation });
+export const debuggerResume = createAction(
+  DEBUG_RESUME,
+  (workspaceLocation: WorkspaceLocation) => ({ payload: { workspaceLocation } })
+);
 
-export const debuggerReset = (workspaceLocation: WorkspaceLocation) =>
-  action(DEBUG_RESET, { workspaceLocation });
+export const debuggerReset = createAction(DEBUG_RESET, (workspaceLocation: WorkspaceLocation) => ({
+  payload: { workspaceLocation }
+}));

src/commons/collabEditing/CollabEditingActions.ts

@@ -1,19 +1,24 @@
-import { action } from 'typesafe-actions'; // EDITING
+import { createAction } from '@reduxjs/toolkit';
 
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import { SET_EDITOR_SESSION_ID, SET_SHAREDB_CONNECTED } from './CollabEditingTypes';
 
-export const setEditorSessionId = (workspaceLocation: WorkspaceLocation, editorSessionId: string) =>
-  action(SET_EDITOR_SESSION_ID, {
-    workspaceLocation,
-    editorSessionId
-  });
+export const setEditorSessionId = createAction(
+  SET_EDITOR_SESSION_ID,
+  (workspaceLocation: WorkspaceLocation, editorSessionId: string) => ({
+    payload: { workspaceLocation, editorSessionId }
+  })
+);
 
 /**
  * Sets ShareDB connection status.
  *
  * @param workspaceLocation the workspace to be reset
  * @param connected whether we are connected to ShareDB
  */
-export const setSharedbConnected = (workspaceLocation: WorkspaceLocation, connected: boolean) =>
-  action(SET_SHAREDB_CONNECTED, { workspaceLocation, connected });
+export const setSharedbConnected = createAction(
+  SET_SHAREDB_CONNECTED,
+  (workspaceLocation: WorkspaceLocation, connected: boolean) => ({
+    payload: { workspaceLocation, connected }
+  })
+);

src/commons/fileSystem/FileSystemActions.ts

@@ -1,7 +1,9 @@
+import { createAction } from '@reduxjs/toolkit';
 import { FSModule } from 'browserfs/dist/node/core/FS';
-import { action } from 'typesafe-actions';
 
 import { SET_IN_BROWSER_FILE_SYSTEM } from './FileSystemTypes';
 
-export const setInBrowserFileSystem = (inBrowserFileSystem: FSModule) =>
-  action(SET_IN_BROWSER_FILE_SYSTEM, { inBrowserFileSystem });
+export const setInBrowserFileSystem = createAction(
+  SET_IN_BROWSER_FILE_SYSTEM,
+  (inBrowserFileSystem: FSModule) => ({ payload: { inBrowserFileSystem } })
+);