Merge remote-tracking branch 'origin/1.1.x_branch' into 1.2.x_branch

src/redux/actions/common_actions.js

@@ -1,5 +1,5 @@
 import * as Constants from '../../constants';
-import {createAction} from 'redux-starter-kit';
+import {createAction} from '@reduxjs/toolkit';
 import {getIPCRenderer} from '../../utils';
 
 const ipcRenderer = getIPCRenderer();
@@ -126,4 +126,4 @@ export const shutdownApplication = () => {
       ipcRenderer.send(Constants.IPC_Shutdown);
     }
   };
-};
+};

src/redux/actions/download_actions.js

@@ -1,5 +1,5 @@
 import * as Constants from '../../constants';
-import {createAction} from 'redux-starter-kit';
+import {createAction} from '@reduxjs/toolkit';
 import {getIPCRenderer} from '../../utils';
 import {notifyError} from './error_actions';
 import {
@@ -96,4 +96,4 @@ export const downloadItem = (name, type, urls, isWinFSP, testVersion, appPlatfor
     };
     downloadAtIndex(0);
   };
-};
+};

src/redux/actions/install_actions.js

@@ -1,5 +1,5 @@
 import * as Constants from '../../constants';
-import {createAction} from 'redux-starter-kit';
+import {createAction} from '@reduxjs/toolkit';
 import {
   getIPCRenderer,
   getSelectedVersionFromState

src/redux/actions/mount_actions.js

@@ -1,5 +1,5 @@
 import * as Constants from '../../constants';
-import {createAction} from 'redux-starter-kit';
+import {createAction} from '@reduxjs/toolkit';
 import {getIPCRenderer} from '../../utils';
 import {
   confirmYesNo,
@@ -156,4 +156,4 @@ export const unmountAll = completedCallback => {
     ipcRenderer.once(Constants.IPC_Unmount_All_Drives_Reply, unmountedCallback);
     ipcRenderer.send(Constants.IPC_Unmount_All_Drives);
   }
-};
+};

src/redux/actions/release_version_actions.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import * as Constants from '../../constants';
-import {createAction} from 'redux-starter-kit';
+import {createAction} from '@reduxjs/toolkit';
 import {notifyError} from './error_actions';
 import {
   saveState,
@@ -181,4 +181,4 @@ export const setUIUpgradeData = (upgradeData, version) => {
       version: version,
     }
   }
-};
+};

src/redux/reducers/common_reducer.js

@@ -1,4 +1,4 @@
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import {
   DISPLAY_CONFIRM_YES_NO,
   notifyRebootRequired,
@@ -58,4 +58,4 @@ export const createCommonReducer = (platformInfo, version) => {
       };
     },
   });
-};
+};

src/redux/reducers/download_reducer.js

@@ -1,4 +1,4 @@
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import {
   setAllowDownload,
   SET_DOWNLOAD_BEGIN,
@@ -50,4 +50,4 @@ export const downloadReducer = createReducer({
       DownloadProgress: action.payload,
     }
   }
-});
+});

src/redux/reducers/error_reducer.js

@@ -1,4 +1,4 @@
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import {
   CLEAR_ERROR,
   CLEAR_INFO,
@@ -49,4 +49,4 @@ export const errorReducer = createReducer({
       InfoStack: infoStack,
     }
   }
-});
+});

src/redux/reducers/install_reducer.js

@@ -1,4 +1,4 @@
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import {
   setDismissDependencies,
   setInstallActive,
@@ -49,4 +49,4 @@ export const installReducer = createReducer({
       MissingDependencies: action.payload,
     }
   }
-});
+});

src/redux/reducers/mount_reducer.js

@@ -1,5 +1,5 @@
 import * as Constants from '../../constants';
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import {
   addRemoteMount2,
   DISPLAY_CONFIGURATION,
@@ -191,4 +191,4 @@ export const createMountReducer = state => {
       };
     }
   });
-};
+};

src/redux/reducers/release_version_reducer.js

@@ -1,4 +1,4 @@
-import {createReducer} from 'redux-starter-kit';
+import {createReducer} from '@reduxjs/toolkit';
 import * as Actions from '../actions/release_version_actions';
 import * as Constants from '../../constants';
 
@@ -83,4 +83,4 @@ export const releaseVersionReducer = createReducer({
       UpgradeDismissed: false,
     };
   }
-});
+});

src/redux/store/createAppStore.js

@@ -1,4 +1,4 @@
-import {configureStore, getDefaultMiddleware} from 'redux-starter-kit';
+import {configureStore, getDefaultMiddleware} from '@reduxjs/toolkit';
 import {createCommonReducer} from '../reducers/common_reducer';
 import {downloadReducer} from '../reducers/download_reducer';
 import {errorReducer} from '../reducers/error_reducer';
@@ -23,4 +23,4 @@ export default function createAppStore(platformInfo, version, state) {
     middleware,
     devTools: process.env.NODE_ENV !== 'production'
   });
-}
+}