Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/upgrades #58

Merged
merged 1 commit into from
May 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .yarn/plugins/yarn-up-all-plugin.cjs

This file was deleted.

768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs

This file was deleted.

785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
37 changes: 18 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
4 changes: 1 addition & 3 deletions public/electron.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion src/components/DropZone/index.jsx
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
7 changes: 4 additions & 3 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading