Skip to content

Commit bf16264

Browse files
CodeDeadCodeDead
authored
Merge pull request #51 from CodeDead/feature/upgrades
Feature/upgrades
2 parents dac12f6 + deadb17 commit bf16264

File tree

26 files changed

+3509
-2504
lines changed

26 files changed

+3509
-2504
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports={name:"yarn-up-all-plugin",factory:a=>{const{Configuration:b,Project:c}=a("@yarnpkg/core"),{Cli:d,Command:e}=a("clipanion"),f=a("yup"),g=a("@yarnpkg/plugin-essentials"),h=(a,b)=>a?`@${a}/${b}`:b,i=(a,b)=>{const c=[...a.values()];return b?c.filter(a=>{const c=h(a[1].scope,a[1].name);return!b.includes(c)}):c};class j extends e{async execute(){if(!g.default.commands)throw new Error("Yarn commands are not available!");const a=await b.find(this.context.cwd,this.context.plugins),{workspace:e}=await c.find(a,this.context.cwd),f=[...e.manifest.dependencies,...e.manifest.devDependencies],j=i(f,this.exclude?this.exclude.split(" "):null),k=j.map(a=>h(a[1].scope,a[1].name)),l=d.from(g.default.commands);return l.runExit(["up",...k],this.context)}}return j.addOption("exclude",e.String("--exclude")),j.addPath("up-all"),j.schema=f.object().shape({exclude:f.string()}),j.usage=e.Usage({description:"Yarn 2 plugin that will upgrade all dependencies to their latest version with one simple command",details:"This command will upgrade all dependencies to their latest version",examples:[["Upgrade all dependencies","yarn up-all"],["Upgrade all dependencies but exclude a single dependency","yarn up-all --exclude package"],["Upgrade all dependencies but exclude multiple dependencies","yarn up-all --exclude \"package1 package2\""]]}),{commands:[j]}}};
1+
module.exports={name:"yarn-up-all-plugin",factory:a=>{const{Configuration:b,Project:c}=a("@yarnpkg/core"),{Cli:d,Command:e,Option:f}=a("clipanion"),g=a("@yarnpkg/plugin-essentials"),h=a("typanion"),i=(a,b)=>a?`@${a}/${b}`:b,j=(a,b)=>{const c=[...a.values()];return b?c.filter(a=>{const c=i(a[1].scope,a[1].name);return!b.includes(c)}):c};class k extends e{constructor(){super(),this.exclude=f.String("-e,--exclude",{validator:h.isString()})}async execute(){if(!g.default.commands)throw new Error("Yarn commands are not available!");const a=await b.find(this.context.cwd,this.context.plugins),{workspace:e}=await c.find(a,this.context.cwd),f=[...e.manifest.dependencies,...e.manifest.devDependencies],h=j(f,this.exclude?this.exclude.split(" "):null),k=h.map(a=>i(a[1].scope,a[1].name)),l=d.from(g.default.commands);return l.runExit(["up",...k],this.context)}}return k.paths=[["up-all"]],k.usage={category:"Utilities",description:"Yarn 2 plugin that will upgrade all dependencies to their latest version with one simple command",details:"This command will upgrade all dependencies to their latest version. You can exclude certain dependencies from being upgraded by using the `-e,--exclude` option.",examples:[["Upgrade all dependencies","yarn up-all"],["Upgrade all dependencies but exclude a single dependency","yarn up-all --exclude package"],["Upgrade all dependencies but exclude a single dependency","yarn up-all -e package"],["Upgrade all dependencies but exclude multiple dependencies","yarn up-all --exclude \"package1 package2\""]]},{commands:[k]}}};

‎.yarn/releases/yarn-2.4.2.cjs‎

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

‎.yarn/releases/yarn-3.0.2.cjs‎

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

‎.yarnrc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ nodeLinker: node-modules
22

33
plugins:
44
- path: .yarn/plugins/yarn-up-all-plugin.cjs
5-
spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.0.5/index.js"
5+
spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.1.0/index.js"
66

7-
yarnPath: .yarn/releases/yarn-2.4.2.cjs
7+
yarnPath: .yarn/releases/yarn-3.0.2.cjs

‎package.json‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@
3535
},
3636
"main": "public/electron.js",
3737
"dependencies": {
38-
"@material-ui/core": "^4.11.4",
39-
"@material-ui/icons": "^4.11.2",
38+
"@emotion/react": "^11.4.1",
39+
"@emotion/styled": "^11.3.0",
40+
"@mui/icons-material": "^5.0.1",
41+
"@mui/material": "^5.0.1",
4042
"crc": "^3.8.0",
4143
"cross-env": "^7.0.3",
4244
"electron-is-dev": "^2.0.0",
4345
"react": "^17.0.2",
4446
"react-contexify": "^5.0.0",
4547
"react-dom": "^17.0.2",
46-
"react-router": "^5.2.0",
47-
"react-router-dom": "^5.2.0",
48+
"react-router": "^5.2.1",
49+
"react-router-dom": "^5.3.0",
4850
"react-scripts": "^4.0.3"
4951
},
5052
"scripts": {
@@ -70,15 +72,15 @@
7072
]
7173
},
7274
"devDependencies": {
73-
"concurrently": "^6.2.0",
74-
"electron": "^13.1.1",
75-
"electron-builder": "^22.10.5",
76-
"eslint": "^7.28.0",
75+
"concurrently": "^6.2.1",
76+
"electron": "^15.0.0",
77+
"electron-builder": "^22.11.7",
78+
"eslint": "^7.32.0",
7779
"eslint-config-airbnb": "^18.2.1",
78-
"eslint-plugin-import": "^2.23.4",
80+
"eslint-plugin-import": "^2.24.2",
7981
"eslint-plugin-jsx-a11y": "^6.4.1",
80-
"eslint-plugin-react": "^7.24.0",
82+
"eslint-plugin-react": "^7.26.0",
8183
"eslint-plugin-react-hooks": "^4.2.0",
82-
"wait-on": "^5.3.0"
84+
"wait-on": "^6.0.0"
8385
}
8486
}

‎src/components/AlertDialog/index.jsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { useState } from 'react';
2-
import DialogTitle from '@material-ui/core/DialogTitle';
3-
import DialogContent from '@material-ui/core/DialogContent';
4-
import DialogContentText from '@material-ui/core/DialogContentText';
5-
import DialogActions from '@material-ui/core/DialogActions';
6-
import Button from '@material-ui/core/Button';
7-
import Dialog from '@material-ui/core/Dialog';
2+
import DialogTitle from '@mui/material/DialogTitle';
3+
import DialogContent from '@mui/material/DialogContent';
4+
import DialogContentText from '@mui/material/DialogContentText';
5+
import DialogActions from '@mui/material/DialogActions';
6+
import Button from '@mui/material/Button';
7+
import Dialog from '@mui/material/Dialog';
88

99
const AlertDialog = ({
1010
title, content, ok, onClose,

‎src/components/App/index.jsx‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
import React, { useContext, useEffect } from 'react';
1+
import React, {
2+
useContext, useEffect, lazy, Suspense,
3+
} from 'react';
24
import { BrowserRouter, Switch, Route } from 'react-router-dom';
3-
import { CssBaseline } from '@material-ui/core';
4-
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
5-
import Home from '../../routes/Home';
6-
import Settings from '../../routes/Settings';
5+
import { CssBaseline } from '@mui/material';
6+
import { createTheme, ThemeProvider } from '@mui/material/styles';
77
import ThemeSelector from '../../utils/ThemeSelector';
88
import TopBar from '../TopBar';
9-
import About from '../../routes/About';
10-
import File from '../../routes/File';
11-
import Text from '../../routes/Text';
129
import DropZone from '../DropZone';
1310
import { MainContext } from '../../contexts/MainContextProvider';
1411
import { CryptoContext } from '../../contexts/CryptoContextReducer';
@@ -18,6 +15,13 @@ import {
1815
setFileHashes,
1916
setFileHashLoading, setTextHashError, setTextHashes, setTextHashLoading,
2017
} from '../../reducers/CryptoReducer/Actions';
18+
import LoadingBar from '../LoadingBar';
19+
20+
const Home = lazy(() => import('../../routes/Home'));
21+
const About = lazy(() => import('../../routes/About'));
22+
const File = lazy(() => import('../../routes/File'));
23+
const Text = lazy(() => import('../../routes/Text'));
24+
const Settings = lazy(() => import('../../routes/Settings'));
2125

2226
const { ipcRenderer } = window.require('electron');
2327

@@ -30,10 +34,10 @@ const App = () => {
3034

3135
const color = ThemeSelector(themeIndex);
3236

33-
const theme = createMuiTheme({
37+
const theme = createTheme({
3438
palette: {
3539
primary: color,
36-
type: themeStyle,
40+
mode: themeStyle,
3741
},
3842
});
3943

@@ -73,23 +77,25 @@ const App = () => {
7377
<DropZone enabled={enabled} onDrop={onDrop} reRoute="/file">
7478
<TopBar />
7579
<CssBaseline />
76-
<Switch>
77-
<Route path="/settings">
78-
<Settings />
79-
</Route>
80-
<Route path="/about">
81-
<About />
82-
</Route>
83-
<Route path="/file">
84-
<File />
85-
</Route>
86-
<Route path="/text">
87-
<Text />
88-
</Route>
89-
<Route path="/">
90-
<Home />
91-
</Route>
92-
</Switch>
80+
<Suspense fallback={<LoadingBar />}>
81+
<Switch>
82+
<Route path="/settings">
83+
<Settings />
84+
</Route>
85+
<Route path="/about">
86+
<About />
87+
</Route>
88+
<Route path="/file">
89+
<File />
90+
</Route>
91+
<Route path="/text">
92+
<Text />
93+
</Route>
94+
<Route path="/">
95+
<Home />
96+
</Route>
97+
</Switch>
98+
</Suspense>
9399
</DropZone>
94100
</BrowserRouter>
95101
</ThemeProvider>

‎src/components/BackButton/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import Button from '@material-ui/core/Button';
3-
import ArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft';
2+
import Button from '@mui/material/Button';
3+
import ArrowLeftIcon from '@mui/icons-material/KeyboardArrowLeft';
44

55
const BackButton = ({ goBack }) => {
66
/**

‎src/components/ConfirmationDialog/index.jsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import Dialog from '@material-ui/core/Dialog';
3-
import DialogTitle from '@material-ui/core/DialogTitle';
4-
import DialogContent from '@material-ui/core/DialogContent';
5-
import DialogContentText from '@material-ui/core/DialogContentText';
6-
import DialogActions from '@material-ui/core/DialogActions';
7-
import Button from '@material-ui/core/Button';
2+
import Dialog from '@mui/material/Dialog';
3+
import DialogTitle from '@mui/material/DialogTitle';
4+
import DialogContent from '@mui/material/DialogContent';
5+
import DialogContentText from '@mui/material/DialogContentText';
6+
import DialogActions from '@mui/material/DialogActions';
7+
import Button from '@mui/material/Button';
88

99
const ConfirmationDialog = ({
1010
open, title, content, onAccept, onCancel, onClose, yes, no,

‎src/components/CopyPasteMenu/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { Item, Menu, useContextMenu } from 'react-contexify';
3-
import CopyIcon from '@material-ui/icons/FileCopy';
4-
import PasteIcon from '@material-ui/icons/Assignment';
3+
import CopyIcon from '@mui/icons-material/FileCopy';
4+
import PasteIcon from '@mui/icons-material/Assignment';
55

66
const CopyPasteMenu = ({
77
id, children, copyData, pasteData, copy, paste,

0 commit comments

Comments
 (0)