diff --git a/source/package.json b/source/package.json index 0a1b40e..2c4de28 100644 --- a/source/package.json +++ b/source/package.json @@ -21,59 +21,58 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@fortawesome/react-fontawesome": "^0.1.15", - "@types/elasticlunr": "^0.9.3", - "@types/highlight.js": "^10.1.0", - "@types/react-router-hash-link": "^2.4.2", - "@types/react-select": "^4.0.18", - "date-fns": "^2.24.0", + "@fortawesome/react-fontawesome": "^0.1.16", + "date-fns": "^2.27.0", "elasticlunr": "^0.9.5", "gray-matter": "^4.0.3", - "highlight.js": "^11.2.0", - "katex": "^0.13.18", + "highlight.js": "^11.3.1", + "katex": "^0.15.1", "local-storage-fallback": "^4.1.2", - "markdown-it": "^12.2.0", - "markdown-it-anchor": "^8.3.1", + "markdown-it": "^12.3.0", + "markdown-it-anchor": "^8.4.1", "markdown-it-attrs": "^4.1.0", - "markdown-it-texmath": "^0.9.1", + "markdown-it-texmath": "^0.9.6", "markdown-toc": "^1.2.0", "query-string": "^7.0.1", "react": "^17.0.2", - "react-collapse": "^5.1.0", + "react-collapse": "^5.1.1", "react-date-range": "^1.4.0", - "react-device-detect": "^2.0.0", + "react-device-detect": "^2.1.2", "react-dnd": "^14.0.4", "react-dnd-html5-backend": "^14.0.2", "react-dom": "^17.0.2", - "react-helmet-async": "^1.1.2", - "react-router-dom": "^5.3.0", + "react-helmet-async": "^1.2.2", + "react-router-dom": "^6.1.1", "react-router-hash-link": "^2.4.3", "react-scripts": "^4.0.3", - "react-select": "^5.0.0", + "react-select": "^5.2.1", "react-tooltip": "^4.2.21", "read-time-estimate": "^0.0.3", - "styled-components": "^5.3.1", - "web-vitals": "^2.1.0" + "styled-components": "^5.3.3", + "web-vitals": "^2.1.2" }, "devDependencies": { + "@types/elasticlunr": "^0.9.4", + "@types/highlight.js": "^10.1.0", "@types/katex": "^0.11.1", - "@types/markdown-it": "^12.2.1", - "@types/node": "^16.10.1", - "@types/react": "^17.0.24", + "@types/markdown-it": "^12.2.3", + "@types/node": "^16.11.12", + "@types/react": "^17.0.37", "@types/react-collapse": "^5.0.1", - "@types/react-date-range": "^1.1.8", - "@types/react-dom": "^17.0.9", - "@types/styled-components": "^5.1.14", - "@typescript-eslint/eslint-plugin": "^4.32.0", - "@typescript-eslint/parser": "^4.32.0", - "eslint": "^7.32.0", + "@types/react-date-range": "^1.4.1", + "@types/react-dom": "^17.0.11", + "@types/react-router-hash-link": "^2.4.4", + "@types/react-select": "^5.0.1", + "@types/styled-components": "^5.1.18", + "@typescript-eslint/eslint-plugin": "^5.7.0", + "@typescript-eslint/parser": "^5.7.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-json": "^3.1.0", - "eslint-plugin-react": "^7.26.0", - "prettier": "^2.4.1", - "ts-node": "^10.2.1", + "eslint-plugin-react": "^7.27.1", + "prettier": "^2.5.1", + "ts-node": "^10.4.0", "tslint-config-prettier": "^1.18.0", - "typescript": "^4.4.3" + "typescript": "^4.5.4" }, "browserslist": { "production": [ diff --git a/source/src/App.tsx b/source/src/App.tsx index b6a8947..5fde2e3 100644 --- a/source/src/App.tsx +++ b/source/src/App.tsx @@ -1,5 +1,5 @@ import React from "react" -import { Switch, Route } from "react-router-dom" +import { Routes, Route } from "react-router-dom" import styled, { ThemeProvider, createGlobalStyle, @@ -333,29 +333,22 @@ export default class App extends React.Component { {this.state.isLoading ? ( ) : ( - - - - + + + } + /> - - - + } /> - - - + } /> - - - + } /> - - {({ match }) => ( - - )} - - + } /> + )}