Skip to content

Commit

Permalink
update deps, update routing
Browse files Browse the repository at this point in the history
  • Loading branch information
iamnapo committed Jun 14, 2021
1 parent d7dc3d2 commit fd9125f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 22 deletions.
16 changes: 8 additions & 8 deletions template.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@
"@craco/craco": "^6.1.2",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@fontsource/roboto": "^4.4.2",
"@fontsource/roboto": "^4.4.5",
"@iamnapo/construct-url": "^2.0.1",
"@material-ui/core": "^5.0.0-alpha.35",
"@material-ui/icons": "^5.0.0-alpha.35",
"@material-ui/lab": "^5.0.0-alpha.35",
"@sentry/browser": "^6.5.1",
"@material-ui/core": "^5.0.0-alpha.36",
"@material-ui/icons": "^5.0.0-alpha.36",
"@material-ui/lab": "^5.0.0-alpha.36",
"@sentry/browser": "^6.7.0",
"clsx": "^1.1.1",
"date-fns": "^2.22.1",
"history": "^4.10.1",
"history": "^5.0.0",
"ky": "^0.28.5",
"prop-types": "^15.7.2",
"query-string": "^7.0.0",
"react-ga": "^3.3.0",
"react-router-dom": "^5.2.0",
"react-router-dom": "^6.0.0-beta.0",
"swr": "^0.5.6",
"web-vitals": "^2.0.1",
"workbox-background-sync": "^6.1.5",
Expand All @@ -98,7 +98,7 @@
"workbox-routing": "^6.1.5",
"workbox-strategies": "^6.1.5",
"workbox-streams": "^6.1.5",
"zustand": "^3.5.1"
"zustand": "^3.5.2"
},
"devDependencies": {
"@cypress/code-coverage": "^3.9.6",
Expand Down
5 changes: 0 additions & 5 deletions template/.ncurc.json

This file was deleted.

3 changes: 0 additions & 3 deletions template/src/history.js

This file was deleted.

11 changes: 5 additions & 6 deletions template/src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy, StrictMode, Suspense, useCallback, useEffect, useState } from "react";
import ReactDOM from "react-dom";
import { Router, Switch, Route, useLocation } from "react-router-dom";
import { BrowserRouter as Router, Routes, Route, useLocation } from "react-router-dom";
import { LinearProgress, CssBaseline, Slide, Alert, Button, Snackbar as MaterialSnackbar } from "@material-ui/core";
import { ThemeProvider, createTheme, StyledEngineProvider } from "@material-ui/core/styles";
import ReactGA from "react-ga";
Expand All @@ -12,7 +12,6 @@ import shallow from "zustand/shallow";
import "./index.scss";

import SnackBar from "./components/SnackBar";
import history from "./history";
import { useGlobalState } from "./utils";
import api from "./api";
import * as serviceWorkerRegistration from "./service-worker-registration";
Expand Down Expand Up @@ -79,11 +78,11 @@ const App = () => {
<SWRConfig value={swrConfig}>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<main>
<Switch>
<Routes>
<Suspense fallback={<LinearProgress />}>
<Route exact path="/" component={Home} />
<Route path="/" element={<Home />} />
</Suspense>
</Switch>
</Routes>
</main>
<SnackBar />
<MaterialSnackbar
Expand All @@ -110,7 +109,7 @@ const App = () => {

ReactDOM.render(
<StrictMode>
<Router history={history}>
<Router>
<App />
</Router>
</StrictMode>,
Expand Down

0 comments on commit fd9125f

Please sign in to comment.