blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

explorer: bump react-router type deps and fix type errors (#28133)

This commit is contained in:
Justin Starry 2022-09-29 16:33:05 +08:00 committed by GitHub
parent 2c49bc9a41
commit 816940c263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
explorer/package-lock.json generated
View File

@ -57,7 +57,7 @@
"@types/node": "^18.0.3", "@types/node": "^18.0.3",
"@types/react": "^18.0.8", "@types/react": "^18.0.8",
"@types/react-dom": "^18.0.6", "@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.2", "@types/react-router-dom": "^5.3.3",
"@types/react-select": "^3.1.2", "@types/react-select": "^3.1.2",
"@types/socket.io-client": "^3.0.0", "@types/socket.io-client": "^3.0.0",
"chai": "^4.3.6", "chai": "^4.3.6",
@ -5925,9 +5925,9 @@
} }
}, },
"node_modules/@types/history": { "node_modules/@types/history": {
"version": "4.7.8", "version": "4.7.11",
"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
"integrity": "sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==", "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
"dev": true "dev": true
}, },
"node_modules/@types/html-minifier-terser": { "node_modules/@types/html-minifier-terser": {
@ -6199,22 +6199,22 @@
} }
}, },
"node_modules/@types/react-router": { "node_modules/@types/react-router": {
"version": "5.1.9", "version": "5.1.19",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.9.tgz", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.19.tgz",
"integrity": "sha512-US6C0rq2Wt/7uje1roqO0R++Sr0jqplKaBChDY5sNg5k7GC/79YFK0ZsLEdemqUjW05wq1Y/9YYEUgfNZ8TlvA==", "integrity": "sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/history": "*", "@types/history": "^4.7.11",
"@types/react": "*" "@types/react": "*"
} }
}, },
"node_modules/@types/react-router-dom": { "node_modules/@types/react-router-dom": {
"version": "5.3.2", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.2.tgz", "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
"integrity": "sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==", "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/history": "*", "@types/history": "^4.7.11",
"@types/react": "*", "@types/react": "*",
"@types/react-router": "*" "@types/react-router": "*"
} }
@ -19978,7 +19978,7 @@
"node_modules/path-to-regexp/node_modules/isarray": { "node_modules/path-to-regexp/node_modules/isarray": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
}, },
"node_modules/path-type": { "node_modules/path-type": {
"version": "3.0.0", "version": "3.0.0",
@ -22075,9 +22075,9 @@
} }
}, },
"node_modules/react-router": { "node_modules/react-router": {
"version": "5.2.1", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",
"integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==", "integrity": "sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.13", "@babel/runtime": "^7.12.13",
"history": "^4.9.0", "history": "^4.9.0",
@ -22095,15 +22095,15 @@
} }
}, },
"node_modules/react-router-dom": { "node_modules/react-router-dom": {
"version": "5.3.0", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.3.tgz",
"integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==", "integrity": "sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.13", "@babel/runtime": "^7.12.13",
"history": "^4.9.0", "history": "^4.9.0",
"loose-envify": "^1.3.1", "loose-envify": "^1.3.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react-router": "5.2.1", "react-router": "5.3.3",
"tiny-invariant": "^1.0.2", "tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0" "tiny-warning": "^1.0.0"
}, },
@ -22123,9 +22123,9 @@
} }
}, },
"node_modules/react-router/node_modules/@babel/runtime": { "node_modules/react-router/node_modules/@babel/runtime": {
"version": "7.15.3", "version": "7.19.0",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
"integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
}, },
@ -31774,9 +31774,9 @@
} }
}, },
"@types/history": { "@types/history": {
"version": "4.7.8", "version": "4.7.11",
"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
"integrity": "sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==", "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
"dev": true "dev": true
}, },
"@types/html-minifier-terser": { "@types/html-minifier-terser": {
@ -32010,22 +32010,22 @@
} }
}, },
"@types/react-router": { "@types/react-router": {
"version": "5.1.9", "version": "5.1.19",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.9.tgz", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.19.tgz",
"integrity": "sha512-US6C0rq2Wt/7uje1roqO0R++Sr0jqplKaBChDY5sNg5k7GC/79YFK0ZsLEdemqUjW05wq1Y/9YYEUgfNZ8TlvA==", "integrity": "sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/history": "*", "@types/history": "^4.7.11",
"@types/react": "*" "@types/react": "*"
} }
}, },
"@types/react-router-dom": { "@types/react-router-dom": {
"version": "5.3.2", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.2.tgz", "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
"integrity": "sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==", "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/history": "*", "@types/history": "^4.7.11",
"@types/react": "*", "@types/react": "*",
"@types/react-router": "*" "@types/react-router": "*"
} }
@ -42701,7 +42701,7 @@
"isarray": { "isarray": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
} }
} }
}, },
@ -44369,9 +44369,9 @@
"integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==" "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
}, },
"react-router": { "react-router": {
"version": "5.2.1", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",
"integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==", "integrity": "sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==",
"requires": { "requires": {
"@babel/runtime": "^7.12.13", "@babel/runtime": "^7.12.13",
"history": "^4.9.0", "history": "^4.9.0",
@ -44386,9 +44386,9 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.15.3", "version": "7.19.0",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
"integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
} }
@ -44405,15 +44405,15 @@
} }
}, },
"react-router-dom": { "react-router-dom": {
"version": "5.3.0", "version": "5.3.3",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.3.tgz",
"integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==", "integrity": "sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==",
"requires": { "requires": {
"@babel/runtime": "^7.12.13", "@babel/runtime": "^7.12.13",
"history": "^4.9.0", "history": "^4.9.0",
"loose-envify": "^1.3.1", "loose-envify": "^1.3.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react-router": "5.2.1", "react-router": "5.3.3",
"tiny-invariant": "^1.0.2", "tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0" "tiny-warning": "^1.0.0"
}, },

2
explorer/package.json
View File

@ -59,7 +59,7 @@
"@types/node": "^18.0.3", "@types/node": "^18.0.3",
"@types/react": "^18.0.8", "@types/react": "^18.0.8",
"@types/react-dom": "^18.0.6", "@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.2", "@types/react-router-dom": "^5.3.3",
"@types/react-select": "^3.1.2", "@types/react-select": "^3.1.2",
"@types/socket.io-client": "^3.0.0", "@types/socket.io-client": "^3.0.0",
"chai": "^4.3.6", "chai": "^4.3.6",

29
explorer/src/App.tsx
View File

@ -42,9 +42,13 @@ function App() {
<Route <Route
exact exact
path={["/tx/inspector", "/tx/:signature/inspect"]} path={["/tx/inspector", "/tx/:signature/inspect"]}
render={({ match }) => ( render={({ match }) => {
<TransactionInspectorPage signature={match.params.signature} /> const signature =
)} "signature" in match.params
? match.params.signature
: undefined;
return <TransactionInspectorPage signature={signature} />;
}}
/> />
<Route <Route
exact exact
@ -61,9 +65,10 @@ function App() {
<Route <Route
exact exact
path={["/block/:id", "/block/:id/:tab"]} path={["/block/:id", "/block/:id/:tab"]}
render={({ match }) => ( render={({ match }) => {
<BlockDetailsPage slot={match.params.id} tab={match.params.tab} /> const tab = "tab" in match.params ? match.params.tab : undefined;
)} return <BlockDetailsPage slot={match.params.id} tab={tab} />;
}}
/> />
<Route <Route
exact exact
@ -82,12 +87,12 @@ function App() {
<Route <Route
exact exact
path={["/address/:address", "/address/:address/:tab"]} path={["/address/:address", "/address/:address/:tab"]}
render={({ match }) => ( render={({ match }) => {
<AccountDetailsPage const tab = "tab" in match.params ? match.params.tab : undefined;
address={match.params.address} return (
tab={match.params.tab} <AccountDetailsPage address={match.params.address} tab={tab} />
/> );
)} }}
/> />
<Route exact path="/"> <Route exact path="/">
<ClusterStatsPage /> <ClusterStatsPage />