Skip to content

Commit d1dcf74

Browse files
authored
Merge pull request #59 from CodeDead/release/v2.2.2
Release/v2.2.2
2 parents 21609cf + 64bf292 commit d1dcf74

File tree

12 files changed

+3568
-3282
lines changed

12 files changed

+3568
-3282
lines changed

.yarn/plugins/yarn-up-all-plugin.cjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

.yarn/releases/yarn-3.1.1.cjs

Lines changed: 0 additions & 768 deletions
This file was deleted.

.yarn/releases/yarn-3.2.0.cjs

Lines changed: 785 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
nodeLinker: node-modules
22

3-
plugins:
4-
- path: .yarn/plugins/yarn-up-all-plugin.cjs
5-
spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.1.0/index.js"
6-
7-
yarnPath: .yarn/releases/yarn-3.1.1.cjs
3+
yarnPath: .yarn/releases/yarn-3.2.0.cjs

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
![GitHub package.json version](https://img.shields.io/github/package-json/v/CodeDead/DeadHash-js)
66
![GitHub](https://img.shields.io/github/license/CodeDead/DeadHash-Js)
7-
![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/v2.2.1/total)
7+
![GitHub all releases](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/total)
88

99
DeadHash is a free and open-source utility to calculate file and text hashes and checksums. The following calculations are supported:
1010

@@ -50,4 +50,3 @@ This library is maintained by CodeDead. You can find more about us using the fol
5050
* [Website](https://codedead.com)
5151
* [Twitter](https://twitter.com/C0DEDEAD)
5252
* [Facebook](https://facebook.com/deadlinecodedead)
53-
* [Reddit](https://reddit.com/r/CodeDead/)

package.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "deadhash",
3-
"version": "2.2.1",
3+
"version": "2.2.2",
44
"description": "File and text hash calculator",
55
"homepage": "./",
66
"private": true,
@@ -35,19 +35,18 @@
3535
},
3636
"main": "public/electron.js",
3737
"dependencies": {
38-
"@emotion/react": "^11.7.1",
39-
"@emotion/styled": "^11.6.0",
40-
"@mui/icons-material": "^5.2.5",
41-
"@mui/material": "^5.2.7",
42-
"crc": "^4.1.0",
38+
"@emotion/react": "^11.9.0",
39+
"@emotion/styled": "^11.8.1",
40+
"@mui/icons-material": "^5.6.2",
41+
"@mui/material": "^5.6.4",
42+
"crc": "^4.1.1",
4343
"cross-env": "^7.0.3",
4444
"electron-is-dev": "^2.0.0",
45-
"react": "^17.0.2",
45+
"react": "^18.1.0",
4646
"react-contexify": "^5.0.0",
47-
"react-dom": "^17.0.2",
48-
"react-router": "^6.2.1",
49-
"react-router-dom": "^6.2.1",
50-
"react-scripts": "^5.0.0"
47+
"react-dom": "^18.1.0",
48+
"react-router-dom": "^6.3.0",
49+
"react-scripts": "^5.0.1"
5150
},
5251
"scripts": {
5352
"react-start": "react-scripts start",
@@ -72,16 +71,16 @@
7271
]
7372
},
7473
"devDependencies": {
75-
"concurrently": "^7.0.0",
76-
"electron": "^16.0.6",
77-
"electron-builder": "^22.14.5",
78-
"eslint": "^8.6.0",
74+
"concurrently": "^7.1.0",
75+
"electron": "^18.2.0",
76+
"electron-builder": "^23.0.3",
77+
"eslint": "^8.15.0",
7978
"eslint-config-airbnb": "^19.0.4",
80-
"eslint-plugin-import": "^2.25.4",
79+
"eslint-plugin-import": "^2.26.0",
8180
"eslint-plugin-jsx-a11y": "^6.5.1",
82-
"eslint-plugin-react": "^7.28.0",
83-
"eslint-plugin-react-hooks": "^4.3.0",
84-
"wait-on": "^6.0.0"
81+
"eslint-plugin-react": "^7.29.4",
82+
"eslint-plugin-react-hooks": "^4.5.0",
83+
"wait-on": "^6.0.1"
8584
},
86-
"packageManager": "yarn@3.1.1"
85+
"packageManager": "yarn@3.2.0"
8786
}

public/electron.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// eslint-disable-next-line import/no-extraneous-dependencies
22
const electron = require('electron');
33

4-
const { app } = electron;
5-
const { ipcMain } = electron;
6-
const { BrowserWindow } = electron;
4+
const { app, ipcMain, BrowserWindow } = electron;
75
const path = require('path');
86
const isDev = require('electron-is-dev');
97

src/components/App/index.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ const App = () => {
7474
<TopBar />
7575
<CssBaseline />
7676
<Routes>
77-
<Route path="/settings" element={<Settings />} />
78-
<Route path="/about" element={<About />} />
79-
<Route path="/file" element={<File />} />
80-
<Route path="/text" element={<Text />} />
81-
<Route path="/" element={<Home />} />
77+
<Route exact path="/" element={<Home />} />
78+
<Route exact path="/settings" element={<Settings />} />
79+
<Route exact path="/about" element={<About />} />
80+
<Route exact path="/file" element={<File />} />
81+
<Route exact path="/text" element={<Text />} />
82+
<Route path="*" element={<Home />} />
8283
</Routes>
8384
</DropZone>
8485
</BrowserRouter>

src/components/DropZone/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { useNavigate } from 'react-router';
2+
import { useNavigate } from 'react-router-dom';
33

44
const DropZone = ({
55
children, onDrop, enabled, reRoute,

src/index.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import React from 'react';
2-
import ReactDOM from 'react-dom';
2+
import { createRoot } from 'react-dom/client';
33
import './index.css';
44
import App from './components/App';
55
import * as serviceWorker from './serviceWorker';
66
import MainContextProvider from './contexts/MainContextProvider';
77
import CryptoContextProvider from './contexts/CryptoContextReducer';
88

9-
ReactDOM.render(
9+
const container = document.getElementById('root');
10+
const root = createRoot(container);
11+
root.render(
1012
<MainContextProvider>
1113
<CryptoContextProvider>
1214
<App />
1315
</CryptoContextProvider>
1416
</MainContextProvider>,
15-
document.getElementById('root'),
1617
);
1718

1819
// If you want your app to work offline and load faster, you can change

src/utils/Updater/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const Updater = (os) => {
3333
version: null,
3434
};
3535

36-
if (isNewer('2.2.1', `${platform.version.majorVersion}.${platform.version.minorVersion}.${platform.version.buildVersion}.${platform.version.revisionVersion}`)) {
36+
if (isNewer('2.2.2', `${platform.version.majorVersion}.${platform.version.minorVersion}.${platform.version.buildVersion}.${platform.version.revisionVersion}`)) {
3737
data.updateAvailable = true;
3838
}
3939

0 commit comments

Comments
 (0)