Remove old, outdated dependencies (#3021)

RichDom2185 · web-flow · commit 72ea6de2bc8e · 2024-08-17T12:56:15.000+08:00
* Create `DeepPartial` type

* Replace redux imports with RTK

* Drop explicit redux dependency

* Drop and replace outdated types
diff --git a/package.json b/package.json
@@ -87,7 +87,6 @@
     "react-sortable-hoc": "^2.0.0",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.2",
-    "redux": "^4.2.1",
     "redux-mock-store": "^1.5.4",
     "redux-saga": "^1.2.3",
     "rehype-react": "^8.0.0",
@@ -110,12 +109,11 @@
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/acorn": "^6.0.0",
     "@types/estree": "^1.0.5",
     "@types/gapi": "^0.0.44",
     "@types/gapi.auth2": "^0.0.57",
     "@types/gapi.client": "^1.0.5",
-    "@types/gapi.client.drive": "^3.0.14",
+    "@types/gapi.client.drive-v3": "^0.0.5",
     "@types/google.picker": "^0.0.39",
     "@types/jest": "^29.0.0",
     "@types/js-cookie": "^3.0.6",
@@ -127,7 +125,6 @@
     "@types/react-redux": "^7.1.24",
     "@types/react-syntax-highlighter": "^15.5.7",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/react-textarea-autosize": "^8.0.0",
     "@types/redux-mock-store": "^1.0.3",
     "@types/showdown": "^2.0.1",
     "@types/uuid": "^9.0.0",
diff --git a/src/commons/application/reducers/RootReducer.ts b/src/commons/application/reducers/RootReducer.ts
@@ -1,4 +1,5 @@
-import { combineReducers } from 'redux';
+import { combineReducers, Reducer } from '@reduxjs/toolkit';
+import { SourceActionType } from 'src/commons/utils/ActionsHelper';
 
 import { AchievementReducer as achievement } from '../../../features/achievement/AchievementReducer';
 import { DashboardReducer as dashboard } from '../../../features/dashboard/DashboardReducer';
@@ -11,7 +12,7 @@ import { OverallState } from '../ApplicationTypes';
 import { RouterReducer as router } from './CommonsReducer';
 import { SessionsReducer as session } from './SessionsReducer';
 
-const rootReducer = combineReducers<OverallState>({
+const rootReducer: Reducer<OverallState, SourceActionType> = combineReducers({
   router,
   achievement,
   dashboard,
diff --git a/src/commons/application/reducers/SessionsReducer.ts b/src/commons/application/reducers/SessionsReducer.ts
@@ -1,5 +1,4 @@
-import { createReducer } from '@reduxjs/toolkit';
-import { Reducer } from 'redux';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 import RemoteExecutionActions from 'src/features/remoteExecution/RemoteExecutionActions';
 
 import { SourceActionType } from '../../utils/ActionsHelper';
diff --git a/src/commons/assessment/__tests__/Assessment.tsx b/src/commons/assessment/__tests__/Assessment.tsx
@@ -1,7 +1,7 @@
+import { Store } from '@reduxjs/toolkit';
 import { act, render, screen } from '@testing-library/react';
 import { Provider } from 'react-redux';
 import { createMemoryRouter, RouterProvider } from 'react-router';
-import { Store } from 'redux';
 import { OverallState, Role } from 'src/commons/application/ApplicationTypes';
 import { mockAssessmentOverviews } from 'src/commons/mocks/AssessmentMocks';
 import { mockInitialStore } from 'src/commons/mocks/StoreMocks';
diff --git a/src/commons/dropdown/__tests__/Dropdown.tsx b/src/commons/dropdown/__tests__/Dropdown.tsx
@@ -1,6 +1,6 @@
+import { Store } from '@reduxjs/toolkit';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router';
-import { Store } from 'redux';
 import { OverallState } from 'src/commons/application/ApplicationTypes';
 import { UserCourse } from 'src/commons/application/types/SessionTypes';
 import { mockInitialStore } from 'src/commons/mocks/StoreMocks';
diff --git a/src/commons/fileSystem/FileSystemReducer.ts b/src/commons/fileSystem/FileSystemReducer.ts
@@ -1,5 +1,4 @@
-import { createReducer } from '@reduxjs/toolkit';
-import { Reducer } from 'redux';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 
 import { defaultFileSystem } from '../application/ApplicationTypes';
 import { SourceActionType } from '../utils/ActionsHelper';
diff --git a/src/commons/mocks/StoreMocks.ts b/src/commons/mocks/StoreMocks.ts
@@ -1,5 +1,5 @@
+import { Store } from '@reduxjs/toolkit';
 import _ from 'lodash';
-import { DeepPartial, Store } from 'redux';
 import mockStore from 'redux-mock-store';
 
 import {
@@ -15,6 +15,7 @@ import {
   OverallState
 } from '../application/ApplicationTypes';
 import { SourceActionType } from '../utils/ActionsHelper';
+import { DeepPartial } from '../utils/TypeHelper';
 
 export function mockInitialStore(
   overrides?: DeepPartial<OverallState>
diff --git a/src/commons/profile/__tests__/Profile.tsx b/src/commons/profile/__tests__/Profile.tsx
@@ -1,10 +1,9 @@
 import { act, render, screen } from '@testing-library/react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router';
-import { DeepPartial } from 'redux';
 import { OverallState, Role } from 'src/commons/application/ApplicationTypes';
 import { mockInitialStore } from 'src/commons/mocks/StoreMocks';
-import { assertType } from 'src/commons/utils/TypeHelper';
+import { assertType, DeepPartial } from 'src/commons/utils/TypeHelper';
 
 import { AssessmentConfiguration, AssessmentStatuses } from '../../assessment/AssessmentTypes';
 import { mockAssessmentOverviews } from '../../mocks/AssessmentMocks';
diff --git a/src/commons/sagas/SideContentSaga.ts b/src/commons/sagas/SideContentSaga.ts
@@ -1,4 +1,4 @@
-import { Action } from 'redux';
+import { Action } from '@reduxjs/toolkit';
 import { put, take } from 'redux-saga/effects';
 import StoriesActions from 'src/features/stories/StoriesActions';
 
diff --git a/src/commons/sideContent/SideContentReducer.ts b/src/commons/sideContent/SideContentReducer.ts
@@ -1,3 +1,5 @@
+import { Reducer } from '@reduxjs/toolkit';
+
 import { defaultSideContent, defaultSideContentManager } from '../application/ApplicationTypes';
 import { SourceActionType } from '../utils/ActionsHelper';
 import {
@@ -11,10 +13,10 @@ import {
 import { getDynamicTabs, getLocation, getTabId } from './SideContentHelper';
 import { SideContentManagerState } from './SideContentTypes';
 
-export function SideContentReducer(
+export const SideContentReducer: Reducer<SideContentManagerState, SourceActionType> = (
   state: SideContentManagerState = defaultSideContentManager,
   action: SourceActionType
-): SideContentManagerState {
+): SideContentManagerState => {
   if (!(action as any).payload?.workspaceLocation) {
     return state;
   }
@@ -146,4 +148,4 @@ export function SideContentReducer(
     default:
       return state;
   }
-}
+};
diff --git a/src/commons/sideContent/content/SideContentCseMachine.tsx b/src/commons/sideContent/content/SideContentCseMachine.tsx
@@ -10,12 +10,12 @@ import {
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { HotkeyItem } from '@mantine/hooks';
+import { bindActionCreators } from '@reduxjs/toolkit';
 import classNames from 'classnames';
 import { Chapter } from 'js-slang/dist/types';
 import { debounce } from 'lodash';
 import React from 'react';
 import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import HotKeys from 'src/commons/hotkeys/HotKeys';
 import { Output } from 'src/commons/repl/Repl';
 import type { PlaygroundWorkspaceState } from 'src/commons/workspace/WorkspaceTypes';
diff --git a/src/commons/sideContent/content/SideContentDataVisualizer.tsx b/src/commons/sideContent/content/SideContentDataVisualizer.tsx
@@ -1,10 +1,10 @@
 import { Button, Card, Classes } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { HotkeyItem } from '@mantine/hooks';
+import { bindActionCreators } from '@reduxjs/toolkit';
 import classNames from 'classnames';
 import React from 'react';
 import { connect, MapDispatchToProps } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import HotKeys from 'src/commons/hotkeys/HotKeys';
 
 import DataVisualizer from '../../../features/dataVisualizer/dataVisualizer';
diff --git a/src/commons/sideContent/content/SideContentHtmlDisplay.tsx b/src/commons/sideContent/content/SideContentHtmlDisplay.tsx
@@ -1,7 +1,7 @@
 import { IconNames } from '@blueprintjs/icons';
+import { bindActionCreators } from '@reduxjs/toolkit';
 import React, { useEffect } from 'react';
 import { connect, MapDispatchToProps } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import { ResultOutput } from 'src/commons/application/ApplicationTypes';
 
 import { beginAlertSideContent } from '../SideContentActions';
diff --git a/src/commons/utils/TypeHelper.ts b/src/commons/utils/TypeHelper.ts
@@ -41,6 +41,11 @@ export type ActionType<T extends Record<string, any>> = {
   [k in keyof T]: ReturnType<T[k]>;
 }[keyof T];
 
+// Copied from redux v4
+export type DeepPartial<T> = {
+  [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
+};
+
 /** Omits the index signature `[key: string]: any;` from type `T` */
 export type RemoveIndex<T> = {
   [K in keyof T as string extends K
diff --git a/src/commons/workspace/WorkspaceReducer.ts b/src/commons/workspace/WorkspaceReducer.ts
@@ -1,6 +1,5 @@
-import { createReducer } from '@reduxjs/toolkit';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 import { stringify } from 'js-slang/dist/utils/stringify';
-import { Reducer } from 'redux';
 
 import { SourcecastReducer } from '../../features/sourceRecorder/sourcecast/SourcecastReducer';
 import { SourcereelReducer } from '../../features/sourceRecorder/sourcereel/SourcereelReducer';
diff --git a/src/features/achievement/AchievementReducer.ts b/src/features/achievement/AchievementReducer.ts
@@ -1,5 +1,4 @@
-import { createReducer } from '@reduxjs/toolkit';
-import { Reducer } from 'redux';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 import { SourceActionType } from 'src/commons/utils/ActionsHelper';
 
 import { defaultAchievement } from '../../commons/application/ApplicationTypes';
diff --git a/src/features/dashboard/DashboardReducer.ts b/src/features/dashboard/DashboardReducer.ts
@@ -1,5 +1,4 @@
-import { createReducer } from '@reduxjs/toolkit';
-import { Reducer } from 'redux';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 
 import { defaultDashboard } from '../../commons/application/ApplicationTypes';
 import { SourceActionType } from '../../commons/utils/ActionsHelper';
diff --git a/src/features/playground/PlaygroundReducer.ts b/src/features/playground/PlaygroundReducer.ts
@@ -1,5 +1,4 @@
-import { createReducer } from '@reduxjs/toolkit';
-import { Reducer } from 'redux';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 
 import { defaultPlayground } from '../../commons/application/ApplicationTypes';
 import { SourceActionType } from '../../commons/utils/ActionsHelper';
diff --git a/src/features/stories/StoriesReducer.ts b/src/features/stories/StoriesReducer.ts
@@ -1,6 +1,5 @@
-import { createReducer } from '@reduxjs/toolkit';
+import { createReducer, Reducer } from '@reduxjs/toolkit';
 import { stringify } from 'js-slang/dist/utils/stringify';
-import { Reducer } from 'redux';
 import { logOut } from 'src/commons/application/actions/CommonsActions';
 
 import {
diff --git a/src/pages/academy/groundControl/GroundControlContainer.ts b/src/pages/academy/groundControl/GroundControlContainer.ts
@@ -1,5 +1,5 @@
+import { bindActionCreators, Dispatch } from '@reduxjs/toolkit';
 import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux';
-import { bindActionCreators, Dispatch } from 'redux';
 
 import SessionActions from '../../../commons/application/actions/SessionActions';
 import { OverallState } from '../../../commons/application/ApplicationTypes';
diff --git a/src/pages/fileSystem/createInBrowserFileSystem.ts b/src/pages/fileSystem/createInBrowserFileSystem.ts
@@ -1,7 +1,7 @@
+import { Store } from '@reduxjs/toolkit';
 import { BFSRequire, configure } from 'browserfs';
 import { ApiError } from 'browserfs/dist/node/core/api_error';
 import { FSModule } from 'browserfs/dist/node/core/FS';
-import { Store } from 'redux';
 
 import { OverallState } from '../../commons/application/ApplicationTypes';
 import { setInBrowserFileSystem } from '../../commons/fileSystem/FileSystemActions';
diff --git a/src/pages/login/__tests__/Login.tsx b/src/pages/login/__tests__/Login.tsx
@@ -1,8 +1,8 @@
+import { Store } from '@reduxjs/toolkit';
 import { render } from '@testing-library/react';
 import { Provider, useDispatch } from 'react-redux';
 import * as ReactRouter from 'react-router';
 import { createMemoryRouter, RouterProvider } from 'react-router';
-import { Store } from 'redux';
 import SessionActions from 'src/commons/application/actions/SessionActions';
 import { OverallState } from 'src/commons/application/ApplicationTypes';
 
diff --git a/src/pages/playground/Playground.tsx b/src/pages/playground/Playground.tsx
@@ -1,6 +1,7 @@
 import { Classes } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { HotkeyItem, useHotkeys } from '@mantine/hooks';
+import { AnyAction, Dispatch } from '@reduxjs/toolkit';
 import { Ace, Range } from 'ace-builds';
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import classNames from 'classnames';
@@ -10,7 +11,6 @@ import { decompressFromEncodedURIComponent } from 'lz-string';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useStore } from 'react-redux';
 import { useLocation, useNavigate } from 'react-router';
-import { AnyAction, Dispatch } from 'redux';
 import InterpreterActions from 'src/commons/application/actions/InterpreterActions';
 import SessionActions from 'src/commons/application/actions/SessionActions';
 import {
diff --git a/src/pages/playground/__tests__/Playground.tsx b/src/pages/playground/__tests__/Playground.tsx
@@ -1,17 +1,16 @@
+import { Dispatch, Store } from '@reduxjs/toolkit';
 import { Router } from '@remix-run/router';
 import { act, render } from '@testing-library/react';
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import { Chapter } from 'js-slang/dist/types';
 import { Provider } from 'react-redux';
 import { createMemoryRouter, RouteObject, RouterProvider } from 'react-router';
-import { Dispatch, Store } from 'redux';
 import {
   defaultEditorValue,
   defaultPlayground,
   OverallState
 } from 'src/commons/application/ApplicationTypes';
-import { WorkspaceSettingsContext } from 'src/commons/WorkspaceSettingsContext';
-import { EditorBinding } from 'src/commons/WorkspaceSettingsContext';
+import { EditorBinding, WorkspaceSettingsContext } from 'src/commons/WorkspaceSettingsContext';
 import { createStore } from 'src/pages/createStore';
 
 import Playground, { handleHash } from '../Playground';
diff --git a/yarn.lock b/yarn.lock
@@ -2016,20 +2016,20 @@
     tar "^6.1.11"
 
 "@maxim_mazurok/gapi.client.discovery-v1@latest":
-  version "0.0.20200806"
-  resolved "https://registry.yarnpkg.com/@maxim_mazurok/gapi.client.discovery-v1/-/gapi.client.discovery-v1-0.0.20200806.tgz#c257738ef5bbf9fefa5b10b0decd444a5f3328b4"
-  integrity sha512-0pZtrElj8bc0YROIo7nH8VVvks/iww/L68l7r74oC9+ksSVO3Lum1zUR8dXTvJ7TqLGaNYiiNaUZianK6doh/w==
+  version "0.1.20200806"
+  resolved "https://registry.yarnpkg.com/@maxim_mazurok/gapi.client.discovery-v1/-/gapi.client.discovery-v1-0.1.20200806.tgz#1bdb82fadd659a159765178993dff6dbcb5968bc"
+  integrity sha512-Wl6UfmZVDdWbY3PUu8E2ULk9RPLjnMqp/iOA4tcK8Ne+U/GmlnWP/e34IaZNGArfl7iXJNOG+/3Rj9L9jQyF9Q==
   dependencies:
     "@types/gapi.client" "*"
-    "@types/gapi.client.discovery" "*"
+    "@types/gapi.client.discovery-v1" "*"
 
 "@maxim_mazurok/gapi.client.drive-v3@latest":
-  version "0.0.20230306"
-  resolved "https://registry.yarnpkg.com/@maxim_mazurok/gapi.client.drive-v3/-/gapi.client.drive-v3-0.0.20230306.tgz#f8170b1b0fa772d706231353eeb7efcd1ea5ea32"
-  integrity sha512-qe1JRq8rG55KDfsR6i7bkrgz0gyoaJvl9Z3VLJBcCrfRWO6SrDS7oBGsbeBfh9uc9Zd5+Wvo1zPA5yI8jvQbQQ==
+  version "0.0.20240809"
+  resolved "https://registry.yarnpkg.com/@maxim_mazurok/gapi.client.drive-v3/-/gapi.client.drive-v3-0.0.20240809.tgz#0246baa4ba7aa0d233d4b5ed58d44e95380f412a"
+  integrity sha512-haPMm4tmz52LdJYJaSPofMP6TB/4Wpfs6Z9sbWskYPlFZbZKdTdJl+ds3deDhJ0RlqLYK5QpjO7pQ15jODY3hw==
   dependencies:
     "@types/gapi.client" "*"
-    "@types/gapi.client.discovery" "*"
+    "@types/gapi.client.discovery-v1" "*"
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
@@ -2776,13 +2776,6 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
-"@types/acorn@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-6.0.0.tgz#7ec9bfdad8e7db4cb03b2b5b05a6f13f77bbc874"
-  integrity sha512-8tSIZoick397hAZIZkiq6R09qNgLjx0CBvmxix3gWyCi6UvXNFjN56xh4e1wTwyYlnTEy32tgo9cooxt6J4lhA==
-  dependencies:
-    acorn "*"
-
 "@types/aria-query@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
@@ -2966,17 +2959,17 @@
   dependencies:
     "@types/gapi" "*"
 
-"@types/gapi.client.discovery@*":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/gapi.client.discovery/-/gapi.client.discovery-1.0.9.tgz#e2472989baa01f2e32a2d5a80981da8513f875ae"
-  integrity sha512-51fXpt7DM7+zPG5pgwnNr3KaRXmyszznu66VPpV7+FAu0LGtpTohvdfvkRCnCn2Z6EgNTq/baFAtCa/9ylHOug==
+"@types/gapi.client.discovery-v1@*":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@types/gapi.client.discovery-v1/-/gapi.client.discovery-v1-0.0.4.tgz#92818a15931430751ed50d2381d0081fd0cefc20"
+  integrity sha512-uevhRumNE65F5mf2gABLaReOmbFSXONuzFZjNR3dYv6BmkHg+wciubHrfBAsp3554zNo3Dcg6dUAlwMqQfpwjQ==
   dependencies:
     "@maxim_mazurok/gapi.client.discovery-v1" latest
 
-"@types/gapi.client.drive@^3.0.14":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@types/gapi.client.drive/-/gapi.client.drive-3.0.15.tgz#4c93f2335ccb53fa4032d8971e8d14e3a5a37783"
-  integrity sha512-qEfI0LxUBadOLmym4FkaNGpI4ibBCBPJHiUFWKIv0GIp7yKT2d+wztJYKr9giIRecErUCF+jGSDw1fzTZ6hPVQ==
+"@types/gapi.client.drive-v3@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@types/gapi.client.drive-v3/-/gapi.client.drive-v3-0.0.5.tgz#19aa36500e6cd4c27bf9646fdde370792f72230f"
+  integrity sha512-yYBxiqMqJVBg4bns4Q28+f2XdJnd3tVA9dxQX1lXMVmzT2B+pZdyCi1u9HLwGveVlookSsAXuqfLfS9KO6MF6w==
   dependencies:
     "@maxim_mazurok/gapi.client.drive-v3" latest
 
@@ -3194,13 +3187,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-textarea-autosize@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@types/react-textarea-autosize/-/react-textarea-autosize-8.0.0.tgz#f68f388552aaa608328b3e352d9a23ad7e0f72e4"
-  integrity sha512-KVqk+/+RMQB3ZDpk7ZTpYHauU3Ue+Y0f09POvGaEpaGb+izzbpoM47tkDGlbF37iT7JYZ8QFwLzqiOPYbQaztA==
-  dependencies:
-    react-textarea-autosize "*"
-
 "@types/react-transition-group@^4.4.0":
   version "4.4.10"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac"
@@ -3738,16 +3724,16 @@ acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
   integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
-acorn@*, acorn@^8.0.4, acorn@^8.1, acorn@^8.12.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
-
 acorn@^7.0.0, acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.0.4, acorn@^8.1, acorn@^8.12.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+
 address@^1.0.1, address@^1.1.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
@@ -11667,7 +11653,7 @@ react-test-renderer@^18.2.0:
     react-shallow-renderer "^16.15.0"
     scheduler "^0.23.0"
 
-react-textarea-autosize@*, react-textarea-autosize@^8.5.2:
+react-textarea-autosize@^8.5.2:
   version "8.5.3"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.5.3.tgz#d1e9fe760178413891484847d3378706052dd409"
   integrity sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Action } from 'redux';`
	`1`	`+import { Action } from '@reduxjs/toolkit';`
`2`	`2`	`import { put, take } from 'redux-saga/effects';`
`3`	`3`	`import StoriesActions from 'src/features/stories/StoriesActions';`
`4`	`4`