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

package.json

@@ -5,34 +5,37 @@
   "author": "scott.e.graves@protonmail.com",
   "description": "GUI for Repertory - Repertory allows you to mount Sia, Goobox S3 and/or ScPrime blockchain storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.",
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.25",
-    "@fortawesome/free-solid-svg-icons": "^5.11.2",
-    "@fortawesome/react-fontawesome": "^0.1.7",
+    "@fortawesome/fontawesome-svg-core": "^1.2.26",
+    "@fortawesome/free-solid-svg-icons": "^5.12.0",
+    "@fortawesome/react-fontawesome": "^0.1.8",
+    "@reduxjs/toolkit": "^1.2.3",
     "auto-launch": "^5.0.5",
-    "axios": "^0.19.0",
+    "axios": "^0.19.2",
     "devtron": "^1.4.0",
     "electron-debug": "^3.0.1",
     "font-awesome": "^4.7.0",
     "node-schedule": "^1.3.2",
     "randomstring": "^1.1.5",
-    "react": "^16.11.0",
-    "react-dom": "^16.11.0",
-    "react-loader-spinner": "^3.1.4",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-loader-spinner": "^3.1.5",
     "react-redux": "^7.1.3",
-    "react-scripts": "3.2.0",
-    "react-tooltip": "^3.11.1",
-    "redux": "^4.0.4",
-    "redux-starter-kit": "^1.0.1",
+    "react-scripts": "3.3.1",
+    "react-tooltip": "^3.11.4",
+    "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
-    "unzipper": "^0.10.5",
+    "unzipper": "^0.10.7",
     "winreg": "^1.2.4"
   },
   "devDependencies": {
-    "cross-env": "^6.0.3",
-    "electron": "^5.0.12",
+    "cross-env": "^7.0.0",
+    "electron": "^5.0.13",
     "electron-builder": "^20.44.4",
     "extract-text-webpack-plugin": "^3.0.2",
-    "typescript": "^3.7.2",
+    "fibers": "^4.0.2",
+    "node-sass": "^4.13.1",
+    "sass": "^1.25.0",
+    "typescript": "^3.7.5",
     "webpack-browser-plugin": "^1.0.20"
   },
   "scripts": {

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'
   });
-}
+}