Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ystxn committed Oct 10, 2023
1 parent 96312bc commit 360e335
Show file tree
Hide file tree
Showing 3 changed files with 1,558 additions and 1,452 deletions.
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@
"build": "vite build"
},
"dependencies": {
"@fontsource/roboto": "^5.0.5",
"@mui/icons-material": "^5.14.1",
"@mui/lab": "5.0.0-alpha.137",
"@mui/material": "^5.14.2",
"@mui/styled-engine": "npm:@mui/styled-engine-sc@5.12.0",
"@mui/styled-engine-sc": "^5.12.0",
"@mui/system": "^5.14.1",
"@mui/x-charts": "^6.0.0-alpha.7",
"@mui/x-data-grid": "^6.10.2",
"@mui/x-date-pickers": "^6.10.2",
"dayjs": "^1.11.9",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.14.12",
"@mui/lab": "5.0.0-alpha.147",
"@mui/material": "^5.14.12",
"@mui/styled-engine": "npm:@mui/styled-engine-sc@5.14.12",
"@mui/styled-engine-sc": "^5.14.12",
"@mui/system": "^5.14.12",
"@mui/x-charts": "6.0.0-alpha.14",
"@mui/x-data-grid": "^6.16.1",
"@mui/x-date-pickers": "^6.16.1",
"dayjs": "^1.11.10",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-is": "^18.2.0",
"react-router-dom": "^6.14.2",
"react-router-dom": "^6.16.0",
"recoil": "^0.7.7",
"styled-components": "^5.3.11",
"styled-components": "^6.0.8",
"workbox-build": "^7.0.0",
"workbox-window": "^7.0.0"
},
"resolutions": {
"@mui/styled-engine": "npm:@mui/styled-engine-sc@5.12.0"
"@mui/styled-engine": "npm:@mui/styled-engine-sc@5.14.12"
},
"devDependencies": {
"@types/react": "^18.2.17",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.3",
"vite": "^4.4.7",
"vite-plugin-pwa": "^0.16.4"
"@types/react": "^18.2.27",
"@types/react-dom": "^18.2.12",
"@vitejs/plugin-react": "^4.1.0",
"vite": "^4.4.11",
"vite-plugin-pwa": "^0.16.5"
}
}
41 changes: 25 additions & 16 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { Suspense } from 'react';
import { createRoot } from 'react-dom/client';
import CssBaseline from '@mui/material/CssBaseline';
import { BrowserRouter } from 'react-router-dom';
import { CircularLoader } from './core/loader';
import { createRoot } from 'react-dom/client';
import { RecoilRoot } from 'recoil';
import { registerSW } from 'virtual:pwa-register';
import { StyleSheetManager } from "styled-components";
import { Suspense } from 'react';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import CssBaseline from '@mui/material/CssBaseline';
import isPropValid from "@emotion/is-prop-valid";
import Session from './core/session';
import StatusBar from './core/statusbar';
import { CircularLoader } from './core/loader';
import { registerSW } from 'virtual:pwa-register';

import '@fontsource/roboto/300.css';
import '@fontsource/roboto/400.css';
Expand Down Expand Up @@ -35,18 +37,25 @@ const darkTheme = createTheme({

registerSW({ immediate: true });

const shouldForwardProp = (propName, elementToBeRendered) =>
typeof elementToBeRendered === "string"
? isPropValid(propName) && !["height", "width"].includes(propName)
: true;

const Index = () => (
<RecoilRoot>
<ThemeProvider theme={darkTheme}>
<CssBaseline />
<Suspense fallback={<CircularLoader />}>
<BrowserRouter>
<Session />
</BrowserRouter>
<StatusBar />
</Suspense>
</ThemeProvider>
</RecoilRoot>
<RecoilRoot>
<StyleSheetManager shouldForwardProp={shouldForwardProp}>
<ThemeProvider theme={darkTheme}>
<CssBaseline />
<Suspense fallback={<CircularLoader />}>
<BrowserRouter>
<Session />
</BrowserRouter>
<StatusBar />
</Suspense>
</ThemeProvider>
</StyleSheetManager>
</RecoilRoot>
);

createRoot(document.querySelector('#root')).render(<Index />);
Loading

0 comments on commit 360e335

Please sign in to comment.