Merge pull request #59 from CodeDead/release/v2.2.2

Release/v2.2.2

.yarnrc.yml

@@ -1,7 +1,3 @@
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/yarn-up-all-plugin.cjs
-    spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.1.0/index.js"
-
-yarnPath: .yarn/releases/yarn-3.1.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

README.md

@@ -4,7 +4,7 @@
 
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/CodeDead/DeadHash-js)
 ![GitHub](https://img.shields.io/github/license/CodeDead/DeadHash-Js)
-![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/v2.2.1/total)
+![GitHub all releases](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/total)
 
 DeadHash is a free and open-source utility to calculate file and text hashes and checksums. The following calculations are supported:
 
@@ -50,4 +50,3 @@ This library is maintained by CodeDead. You can find more about us using the fol
 * [Website](https://codedead.com)
 * [Twitter](https://twitter.com/C0DEDEAD)
 * [Facebook](https://facebook.com/deadlinecodedead)
-* [Reddit](https://reddit.com/r/CodeDead/)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deadhash",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "File and text hash calculator",
   "homepage": "./",
   "private": true,
@@ -35,19 +35,18 @@
   },
   "main": "public/electron.js",
   "dependencies": {
-    "@emotion/react": "^11.7.1",
-    "@emotion/styled": "^11.6.0",
-    "@mui/icons-material": "^5.2.5",
-    "@mui/material": "^5.2.7",
-    "crc": "^4.1.0",
+    "@emotion/react": "^11.9.0",
+    "@emotion/styled": "^11.8.1",
+    "@mui/icons-material": "^5.6.2",
+    "@mui/material": "^5.6.4",
+    "crc": "^4.1.1",
     "cross-env": "^7.0.3",
     "electron-is-dev": "^2.0.0",
-    "react": "^17.0.2",
+    "react": "^18.1.0",
     "react-contexify": "^5.0.0",
-    "react-dom": "^17.0.2",
-    "react-router": "^6.2.1",
-    "react-router-dom": "^6.2.1",
-    "react-scripts": "^5.0.0"
+    "react-dom": "^18.1.0",
+    "react-router-dom": "^6.3.0",
+    "react-scripts": "^5.0.1"
   },
   "scripts": {
     "react-start": "react-scripts start",
@@ -72,16 +71,16 @@
     ]
   },
   "devDependencies": {
-    "concurrently": "^7.0.0",
-    "electron": "^16.0.6",
-    "electron-builder": "^22.14.5",
-    "eslint": "^8.6.0",
+    "concurrently": "^7.1.0",
+    "electron": "^18.2.0",
+    "electron-builder": "^23.0.3",
+    "eslint": "^8.15.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.28.0",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "wait-on": "^6.0.0"
+    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react-hooks": "^4.5.0",
+    "wait-on": "^6.0.1"
   },
-  "packageManager": "yarn@3.1.1"
+  "packageManager": "yarn@3.2.0"
 }

public/electron.js

@@ -1,9 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 const electron = require('electron');
 
-const { app } = electron;
-const { ipcMain } = electron;
-const { BrowserWindow } = electron;
+const { app, ipcMain, BrowserWindow } = electron;
 const path = require('path');
 const isDev = require('electron-is-dev');
 

src/components/App/index.jsx

@@ -74,11 +74,12 @@ const App = () => {
           <TopBar />
           <CssBaseline />
           <Routes>
-            <Route path="/settings" element={<Settings />} />
-            <Route path="/about" element={<About />} />
-            <Route path="/file" element={<File />} />
-            <Route path="/text" element={<Text />} />
-            <Route path="/" element={<Home />} />
+            <Route exact path="/" element={<Home />} />
+            <Route exact path="/settings" element={<Settings />} />
+            <Route exact path="/about" element={<About />} />
+            <Route exact path="/file" element={<File />} />
+            <Route exact path="/text" element={<Text />} />
+            <Route path="*" element={<Home />} />
           </Routes>
         </DropZone>
       </BrowserRouter>

src/components/DropZone/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router';
+import { useNavigate } from 'react-router-dom';
 
 const DropZone = ({
   children, onDrop, enabled, reRoute,

src/index.jsx

@@ -1,18 +1,19 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import './index.css';
 import App from './components/App';
 import * as serviceWorker from './serviceWorker';
 import MainContextProvider from './contexts/MainContextProvider';
 import CryptoContextProvider from './contexts/CryptoContextReducer';
 
-ReactDOM.render(
+const container = document.getElementById('root');
+const root = createRoot(container);
+root.render(
   <MainContextProvider>
     <CryptoContextProvider>
       <App />
     </CryptoContextProvider>
   </MainContextProvider>,
-  document.getElementById('root'),
 );
 
 // If you want your app to work offline and load faster, you can change

src/utils/Updater/index.js

@@ -33,7 +33,7 @@ const Updater = (os) => {
       version: null,
     };
 
-    if (isNewer('2.2.1', `${platform.version.majorVersion}.${platform.version.minorVersion}.${platform.version.buildVersion}.${platform.version.revisionVersion}`)) {
+    if (isNewer('2.2.2', `${platform.version.majorVersion}.${platform.version.minorVersion}.${platform.version.buildVersion}.${platform.version.revisionVersion}`)) {
       data.updateAvailable = true;
     }