From 168f14e2fcb206223dee73787d23d433fac9e48c Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Sun, 2 Jun 2019 18:10:15 +0300
Subject: [PATCH] Update react, material-ui and react-router-dom
---
package-lock.json | 694 ++++++++++++++----
package.json | 11 +-
src/client/components/facet_bar/ChipsArray.js | 2 +-
src/client/components/facet_bar/FacetBar.js | 16 +-
.../components/facet_bar/FacetHeader.js | 8 +-
src/client/components/facet_bar/FacetInfo.js | 4 +-
.../components/facet_bar/HierarchicalFacet.js | 18 +-
src/client/components/facet_bar/TextFacet.js | 2 +-
src/client/components/facet_results/Deck.js | 8 +-
src/client/components/facet_results/Pie.js | 10 +-
.../components/facet_results/ResultTable.js | 2 +-
.../ResultTablePaginationActions.js | 2 +-
src/client/components/main_layout/Footer.js | 14 +-
src/client/components/main_layout/Main.js | 16 +-
src/client/components/main_layout/TopBar.js | 13 +-
.../main_layout/TopBarSearchField.js | 16 +-
src/client/containers/SemanticPortal.js | 4 +-
17 files changed, 612 insertions(+), 228 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index abb6ed85..217a1501 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2759,6 +2759,11 @@
"prop-types": "^15.6.0"
}
},
+ "@emotion/hash": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.1.tgz",
+ "integrity": "sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA=="
+ },
"@jest/console": {
"version": "24.3.0",
"resolved": "https://registry.npmjs.org/@jest/console/-/console-24.3.0.tgz",
@@ -3821,65 +3826,115 @@
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
"@material-ui/core": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.9.0.tgz",
- "integrity": "sha512-9fxu0B9zx/TfiU0OJmwRFk+I+2J7fcXzTfQl+ZPxqlVRrPDqTHnMZlqWRJjlHCe3AVXlgpJ6/a4QCvGEohEbIQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.0.1.tgz",
+ "integrity": "sha512-cw2Qs3BLem8FOrp/knfjJkwJXG4dZO/HGyWwZV71UWiqDIOF3plHZ7duCbOMIWwKgSUJ85k9omlSHUTT63E/pw==",
"requires": {
"@babel/runtime": "^7.2.0",
- "@material-ui/system": "^3.0.0-alpha.0",
- "@material-ui/utils": "^3.0.0-alpha.2",
- "@types/jss": "^9.5.6",
- "@types/react-transition-group": "^2.0.8",
- "brcast": "^3.0.1",
- "classnames": "^2.2.5",
+ "@material-ui/styles": "^4.0.1",
+ "@material-ui/system": "^4.0.1",
+ "@material-ui/types": "^4.0.1",
+ "@material-ui/utils": "^4.0.1",
+ "@types/react-transition-group": "^2.0.16",
+ "clsx": "^1.0.2",
+ "convert-css-length": "^1.0.2",
"csstype": "^2.5.2",
"debounce": "^1.1.0",
"deepmerge": "^3.0.0",
- "dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^3.2.1",
"is-plain-object": "^2.0.4",
- "jss": "^9.8.7",
- "jss-camel-case": "^6.0.0",
- "jss-default-unit": "^8.0.2",
- "jss-global": "^3.0.0",
- "jss-nested": "^6.0.1",
- "jss-props-sort": "^6.0.0",
- "jss-vendor-prefixer": "^7.0.0",
- "keycode": "^2.1.9",
"normalize-scroll-left": "^0.1.2",
"popper.js": "^1.14.1",
- "prop-types": "^15.6.0",
- "react-event-listener": "^0.6.2",
- "react-transition-group": "^2.2.1",
- "recompose": "0.28.0 - 0.30.0",
+ "prop-types": "^15.7.2",
+ "react-event-listener": "^0.6.6",
+ "react-transition-group": "^4.0.0",
"warning": "^4.0.1"
},
"dependencies": {
- "@babel/runtime": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
- "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
+ "@material-ui/system": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.0.1.tgz",
+ "integrity": "sha512-NlMF4jZk1xx7taUOT+QhrJw7v7uUi9Ae+G8C8fowGgP5x04whxOuSuSmN9a8u2j7dc8XqahR0OJeA6Xch8ymog==",
"requires": {
- "regenerator-runtime": "^0.12.0"
+ "@babel/runtime": "^7.2.0",
+ "deepmerge": "^3.0.0",
+ "prop-types": "^15.7.2",
+ "warning": "^4.0.1"
+ }
+ },
+ "@material-ui/utils": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.0.1.tgz",
+ "integrity": "sha512-mWRcMQIrqsXGze73tx3hNfB1NUu+BL/oIQI7TImyuhsia1EQXw3bPVBjgwTzqM6MqfXw6eh1fR45Di+WN5hASA==",
+ "requires": {
+ "@babel/runtime": "^7.2.0",
+ "prop-types": "^15.7.2",
+ "react-is": "^16.8.0"
+ }
+ },
+ "@types/react-transition-group": {
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.9.1.tgz",
+ "integrity": "sha512-1usq4DRUVBFnxc9KGJAlJO9EpQrLZGDDEC8wDOn2+2ODSyudYo8FiIzPDRaX/hfQjHqGeeoNaNdA2bj0l35hZQ==",
+ "requires": {
+ "@types/react": "*"
}
},
"hoist-non-react-statics": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
- "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+ "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
"requires": {
- "react-is": "^16.3.2"
+ "react-is": "^16.7.0"
}
},
- "regenerator-runtime": {
- "version": "0.12.1",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
- "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ },
+ "prop-types": {
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+ "requires": {
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ }
+ },
+ "react-event-listener": {
+ "version": "0.6.6",
+ "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
+ "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
+ "requires": {
+ "@babel/runtime": "^7.2.0",
+ "prop-types": "^15.6.0",
+ "warning": "^4.0.1"
+ }
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+ },
+ "react-transition-group": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.1.0.tgz",
+ "integrity": "sha512-/OITbogb3emGN49WaP7468QGSde7er5w6eIHldIDCSQBq/9QTSCzs8OgpgmOnaUXCXzBUcK1zoZ6DqRlM8CJtA==",
+ "requires": {
+ "dom-helpers": "^3.4.0",
+ "loose-envify": "^1.4.0",
+ "prop-types": "^15.6.2"
+ }
},
"warning": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz",
- "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+ "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
@@ -3887,53 +3942,95 @@
}
},
"@material-ui/icons": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-3.0.2.tgz",
- "integrity": "sha512-QY/3gJnObZQ3O/e6WjH+0ah2M3MOgLOzCy8HTUoUx9B6dDrS18vP7Ycw3qrDEKlB6q1KNxy6CZHm5FCauWGy2g==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.0.1.tgz",
+ "integrity": "sha512-03zUfksGXXbaWX2piB1LCmC28eydlT8ah8MbYT4n4mgiX9BTL4HH50lkFn9JIJJSk2oO5kRy4FvpXRGRBI+oxw==",
"requires": {
- "@babel/runtime": "^7.2.0",
- "recompose": "0.28.0 - 0.30.0"
- },
- "dependencies": {
- "@babel/runtime": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
- "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
- "requires": {
- "regenerator-runtime": "^0.12.0"
- }
- },
- "regenerator-runtime": {
- "version": "0.12.1",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
- "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
- }
+ "@babel/runtime": "^7.2.0"
}
},
- "@material-ui/lab": {
- "version": "3.0.0-alpha.28",
- "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-3.0.0-alpha.28.tgz",
- "integrity": "sha512-uERqo8W2RhWDDaO1FMmvWS9GHBX3Sdhu1F7o+Z2M8wQ6viKcvONVlN4oC80VP6fgze8p5cnjmNhFLuCypLRHTg==",
+ "@material-ui/styles": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.0.1.tgz",
+ "integrity": "sha512-SywkWzBzXvm9dUY2rtmzTc/FTlKGctVYGb8hzPZyHU3OI4X9jQH4YnR/OiqTwg4jNpFnASJX5rW1rEUJM+ZnhA==",
"requires": {
"@babel/runtime": "^7.2.0",
- "@material-ui/utils": "^3.0.0-alpha.2",
- "classnames": "^2.2.5",
- "keycode": "^2.1.9",
- "prop-types": "^15.6.0"
+ "@emotion/hash": "^0.7.1",
+ "@material-ui/types": "^4.0.1",
+ "@material-ui/utils": "^4.0.1",
+ "clsx": "^1.0.2",
+ "deepmerge": "^3.0.0",
+ "hoist-non-react-statics": "^3.2.1",
+ "jss": "^10.0.0-alpha.16",
+ "jss-plugin-camel-case": "^10.0.0-alpha.16",
+ "jss-plugin-default-unit": "^10.0.0-alpha.16",
+ "jss-plugin-global": "^10.0.0-alpha.16",
+ "jss-plugin-nested": "^10.0.0-alpha.16",
+ "jss-plugin-props-sort": "^10.0.0-alpha.16",
+ "jss-plugin-rule-value-function": "^10.0.0-alpha.16",
+ "jss-plugin-vendor-prefixer": "^10.0.0-alpha.16",
+ "prop-types": "^15.7.2",
+ "warning": "^4.0.1"
},
"dependencies": {
- "@babel/runtime": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
- "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
+ "@material-ui/utils": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.0.1.tgz",
+ "integrity": "sha512-mWRcMQIrqsXGze73tx3hNfB1NUu+BL/oIQI7TImyuhsia1EQXw3bPVBjgwTzqM6MqfXw6eh1fR45Di+WN5hASA==",
"requires": {
- "regenerator-runtime": "^0.12.0"
+ "@babel/runtime": "^7.2.0",
+ "prop-types": "^15.7.2",
+ "react-is": "^16.8.0"
}
},
- "regenerator-runtime": {
- "version": "0.12.1",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
- "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+ "hoist-non-react-statics": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+ "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+ "requires": {
+ "react-is": "^16.7.0"
+ }
+ },
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ },
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ },
+ "prop-types": {
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+ "requires": {
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ }
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+ },
+ "warning": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+ "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+ "requires": {
+ "loose-envify": "^1.0.0"
+ }
}
}
},
@@ -3976,6 +4073,11 @@
}
}
},
+ "@material-ui/types": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-4.0.1.tgz",
+ "integrity": "sha512-FGhogU9l4s+ycMcC3hhOAvu5hcWa5TVSCCGUf4NOUF904ythroWSAvcCHn92NjftXZ8WZqmtPjL1K/d90Pq/3Q=="
+ },
"@material-ui/utils": {
"version": "3.0.0-alpha.3",
"resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz",
@@ -5977,6 +6079,11 @@
"date-now": "^0.1.4"
}
},
+ "console-polyfill": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/console-polyfill/-/console-polyfill-0.1.2.tgz",
+ "integrity": "sha1-ls/tUcr3gYn2mVcubxgnHcN8DjA="
+ },
"constants-browserify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -5999,6 +6106,15 @@
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
+ "convert-css-length": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/convert-css-length/-/convert-css-length-1.0.2.tgz",
+ "integrity": "sha512-ecV7j3hXyXN1X2XfJBzhMR0o1Obv0v3nHmn0UiS3ACENrzbxE/EknkiunS/fCwQva0U62X1GChi8GaPh4oTlLg==",
+ "requires": {
+ "console-polyfill": "^0.1.2",
+ "parse-unit": "^1.0.1"
+ }
+ },
"convert-source-map": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
@@ -6097,6 +6213,15 @@
"sha.js": "^2.4.8"
}
},
+ "create-react-context": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
+ "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
+ "requires": {
+ "fbjs": "^0.8.0",
+ "gud": "^1.0.0"
+ }
+ },
"cross-spawn": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -8265,8 +8390,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -8287,14 +8411,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -8309,20 +8431,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -8439,8 +8558,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -8452,7 +8570,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -8467,7 +8584,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -8475,14 +8591,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -8501,7 +8615,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -8582,8 +8695,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -8595,7 +8707,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -8681,8 +8792,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -8718,7 +8828,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -8738,7 +8847,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -8782,14 +8890,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -8983,6 +9089,11 @@
"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
"dev": true
},
+ "gud": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+ "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+ },
"hammerjs": {
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
@@ -9157,15 +9268,16 @@
"integrity": "sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw="
},
"history": {
- "version": "4.7.2",
- "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz",
- "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz",
+ "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==",
"requires": {
- "invariant": "^2.2.1",
+ "@babel/runtime": "^7.1.2",
"loose-envify": "^1.2.0",
"resolve-pathname": "^2.2.0",
- "value-equal": "^0.4.0",
- "warning": "^3.0.0"
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0",
+ "value-equal": "^0.4.0"
}
},
"hmac-drbg": {
@@ -11696,6 +11808,170 @@
"warning": "^3.0.0"
}
},
+ "jss-plugin-camel-case": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-nki+smHEsFyoZ0OlOYtaxVqcQA0ZHVJCE1slRnk+1TklbmxbBiO4TwITMTEaNIDv0U0Uyb0Z8wVgFgRwCCIFog==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "hyphenate-style-name": "^1.0.3",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "hyphenate-style-name": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
+ "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ=="
+ },
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-default-unit": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-jjGW4F/r9yKvoyUk22M8nWhdMfvoWzJw/oFO2cDRXCk2onnWFiRALfqeUsEDyocwdZbyVF9WhZbSHn4GL03kSw==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-global": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-B1mm2ZF9OEsWPmzkG5ZUXqV88smDqpc4unILLXhWVuj0U5JeT0DNitH+QbXFrSueDJzkWVfvqyckvWDR/0qeDg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-nested": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-3l/MB6COnIpq4GOXQFae6UydoaIPa81UxhuBTEQuiAojgTeUla9L7nB3h18Q4zAhQQpjxaEsyppAKuEzIP7kPQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16",
+ "tiny-warning": "^1.0.2"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-props-sort": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-+Yn9nugHAH58nf/d43H2uxMvlCFPDgLKRSmKO4Q4m1IGYjMbHsWt1Rk2HfC9IiCanqcqpc8hstwtzf+HG7PWFQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-rule-value-function": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-MQap9ne6ZGZH0NlpSQTMSm6QalBTF0hYpd2uaGQwam+GlT7IKeO+sTjd46I1WgO3kyOmwb0pIY6CnuLQGXKtSA==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-vendor-prefixer": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-70yJ6QE5dN8VlPUGKld5jK2SKyrteheEL/ismexpybIufunMs6iJgkhDndbOfv8ia13yZgUVqeakMdhRKYwK1A==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "css-vendor": "^2.0.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "css-vendor": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.2.tgz",
+ "integrity": "sha512-Xn5ZAlI00d8HaQ8/oQ8d+iBzSF//NCc77LPzsucM32X/R/yTqmXy6otVsAM0XleXk6HjPuXoVZwXsayky/fsFQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.0.2"
+ }
+ },
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
"jss-props-sort": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
@@ -11723,11 +11999,6 @@
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-2.0.1.tgz",
"integrity": "sha512-9KqSdmWCkBIisFIGclT0FRagKhI7IVbMyUjsxCFG0Ly1Dg6whlxJ7b9lrq8ifk3X/fGeJzok1R75LQfZTfA5zQ=="
},
- "keycode": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
- "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
- },
"keypress": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz",
@@ -13078,6 +13349,11 @@
"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
"dev": true
},
+ "parse-unit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parse-unit/-/parse-unit-1.0.1.tgz",
+ "integrity": "sha1-fhu21b7zh0wo45JSaiVBFwKR7s8="
+ },
"parse5": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@@ -13682,22 +13958,47 @@
}
},
"react": {
- "version": "16.6.1",
- "resolved": "https://registry.npmjs.org/react/-/react-16.6.1.tgz",
- "integrity": "sha512-OtawJThYlvRgm9BXK+xTL7BIlDx8vv21j+fbQDjRRUyok6y7NyjlweGorielTahLZHYIdKUoK2Dp9ByVWuMqxw==",
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
+ "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
- "scheduler": "^0.11.0"
+ "scheduler": "^0.13.6"
},
"dependencies": {
"prop-types": {
- "version": "15.6.2",
- "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
- "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
- "loose-envify": "^1.3.1",
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ },
+ "dependencies": {
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ }
+ }
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+ },
+ "scheduler": {
+ "version": "0.13.6",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+ "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+ "requires": {
+ "loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
}
@@ -13854,22 +14155,47 @@
}
},
"react-dom": {
- "version": "16.6.1",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.1.tgz",
- "integrity": "sha512-zm+wBuEMGm009Wt1uE4Zw5KcXOW7qC4E/xW/fpJsCsbOco4U/R84u+DzzO/S4SYSdNBcqcaulcp4w3FXl8pImw==",
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
+ "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
- "scheduler": "^0.11.0"
+ "scheduler": "^0.13.6"
},
"dependencies": {
"prop-types": {
- "version": "15.6.2",
- "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
- "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
- "loose-envify": "^1.3.1",
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ },
+ "dependencies": {
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ }
+ }
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+ },
+ "scheduler": {
+ "version": "0.13.6",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+ "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+ "requires": {
+ "loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
}
@@ -14005,19 +14331,30 @@
}
},
"react-router": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz",
- "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz",
+ "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==",
"requires": {
- "history": "^4.7.2",
- "hoist-non-react-statics": "^2.5.0",
- "invariant": "^2.2.4",
+ "@babel/runtime": "^7.1.2",
+ "create-react-context": "^0.2.2",
+ "history": "^4.9.0",
+ "hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1",
"path-to-regexp": "^1.7.0",
- "prop-types": "^15.6.1",
- "warning": "^4.0.1"
+ "prop-types": "^15.6.2",
+ "react-is": "^16.6.0",
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0"
},
"dependencies": {
+ "hoist-non-react-statics": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+ "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+ "requires": {
+ "react-is": "^16.7.0"
+ }
+ },
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -14031,36 +14368,71 @@
"isarray": "0.0.1"
}
},
- "warning": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz",
- "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==",
+ "prop-types": {
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
- "loose-envify": "^1.0.0"
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ },
+ "dependencies": {
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ }
}
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
}
}
},
"react-router-dom": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz",
- "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz",
+ "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==",
"requires": {
- "history": "^4.7.2",
- "invariant": "^2.2.4",
+ "@babel/runtime": "^7.1.2",
+ "history": "^4.9.0",
"loose-envify": "^1.3.1",
- "prop-types": "^15.6.1",
- "react-router": "^4.3.1",
- "warning": "^4.0.1"
+ "prop-types": "^15.6.2",
+ "react-router": "5.0.0",
+ "tiny-invariant": "^1.0.2",
+ "tiny-warning": "^1.0.0"
},
"dependencies": {
- "warning": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz",
- "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==",
+ "prop-types": {
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
- "loose-envify": "^1.0.0"
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.8.1"
+ },
+ "dependencies": {
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ }
+ }
}
+ },
+ "react-is": {
+ "version": "16.8.6",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+ "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
}
}
},
@@ -14822,6 +15194,7 @@
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.0.tgz",
"integrity": "sha512-MAYbBfmiEHxF0W+c4CxMpEqMYK+rYF584VP/qMKSiHM6lTkBKKYOJaDiSILpJHla6hBOsVd6GucPL46o2Uq3sg==",
+ "dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@@ -15783,6 +16156,11 @@
"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz",
"integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g=="
},
+ "tiny-warning": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz",
+ "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q=="
+ },
"tinyqueue": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz",
diff --git a/package.json b/package.json
index b8b2094d..723e16c1 100644
--- a/package.json
+++ b/package.json
@@ -54,9 +54,8 @@
},
"dependencies": {
"@babel/runtime": "^7.4.2",
- "@material-ui/core": "^3.9.0",
- "@material-ui/icons": "^3.0.2",
- "@material-ui/lab": "^3.0.0-alpha.28",
+ "@material-ui/core": "^4.0.1",
+ "@material-ui/icons": "^4.0.1",
"Leaflet.Control.Opacity": "git+https://github.com/SemanticComputing/Leaflet.Control.Opacity.git",
"Leaflet.extra-markers": "git+https://github.com/SemanticComputing/Leaflet.ExtraMarkers.git",
"axios": "^0.18.0",
@@ -70,14 +69,14 @@
"leaflet.markercluster": "^1.4.1",
"lodash": "^4.17.11",
"material-table": "^1.32.0",
- "react": "^16.6.1",
+ "react": "^16.8.6",
"react-compound-slider": "^1.2.2",
"react-csv": "^1.0.18",
- "react-dom": "^16.6.1",
+ "react-dom": "^16.8.6",
"react-map-gl": "^4.0.0",
"react-redux": "^5.1.0",
"react-redux-toastr": "^7.4.1",
- "react-router-dom": "^4.3.1",
+ "react-router-dom": "^5.0.0",
"react-sortable-tree": "^2.6.0",
"react-sortable-tree-theme-file-explorer": "^2.0.0",
"recompose": "^0.28.2",
diff --git a/src/client/components/facet_bar/ChipsArray.js b/src/client/components/facet_bar/ChipsArray.js
index fee088b0..b16686a9 100644
--- a/src/client/components/facet_bar/ChipsArray.js
+++ b/src/client/components/facet_bar/ChipsArray.js
@@ -10,7 +10,7 @@ const styles = theme => ({
flexWrap: 'wrap',
},
chip: {
- margin: theme.spacing.unit / 2,
+ margin: theme.spacing(0.5),
},
});
diff --git a/src/client/components/facet_bar/FacetBar.js b/src/client/components/facet_bar/FacetBar.js
index 20496677..44f80884 100644
--- a/src/client/components/facet_bar/FacetBar.js
+++ b/src/client/components/facet_bar/FacetBar.js
@@ -16,40 +16,40 @@ const styles = theme => ({
headingContainer: {
display: 'flex',
alignItems: 'center',
- paddingLeft: theme.spacing.unit,
+ paddingLeft: theme.spacing(1),
borderBottomLeftRadius: 0,
borderBottomRightRadius: 0,
},
facetContainer: {
- marginBottom: theme.spacing.unit,
+ marginBottom: theme.spacing(1),
},
facetContainerLast: {
marginBottom: 2,
},
one: {
- paddingLeft: theme.spacing.unit
+ paddingLeft: theme.spacing(1)
},
three: {
height: 108,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
four: {
height: 135,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
five: {
height: 150,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
ten: {
height: 350,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
facetHeaderButtons: {
marginLeft: 'auto'
},
textContainer: {
- padding: theme.spacing.unit
+ padding: theme.spacing(1)
},
});
diff --git a/src/client/components/facet_bar/FacetHeader.js b/src/client/components/facet_bar/FacetHeader.js
index 52077a30..5ab7c936 100644
--- a/src/client/components/facet_bar/FacetHeader.js
+++ b/src/client/components/facet_bar/FacetHeader.js
@@ -18,24 +18,24 @@ const styles = theme => ({
headingContainer: {
display: 'flex',
alignItems: 'center',
- paddingLeft: theme.spacing.unit,
+ paddingLeft: theme.spacing(1),
borderBottomLeftRadius: 0,
borderBottomRightRadius: 0,
height: 48
},
facetContainer: {
- marginBottom: theme.spacing.unit,
+ marginBottom: theme.spacing(1),
},
facetContainerLast: {
marginBottom: 2,
},
facetValuesContainerTen: {
height: 345,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
facetValuesContainerThree: {
height: 108,
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
},
facetHeaderButtons: {
marginLeft: 'auto'
diff --git a/src/client/components/facet_bar/FacetInfo.js b/src/client/components/facet_bar/FacetInfo.js
index 993f915b..a5c88932 100644
--- a/src/client/components/facet_bar/FacetInfo.js
+++ b/src/client/components/facet_bar/FacetInfo.js
@@ -10,8 +10,8 @@ import purple from '@material-ui/core/colors/purple';
const styles = theme => ({
facetInfoDivider: {
- marginTop: theme.spacing.unit / 2,
- marginBottom: theme.spacing.unit / 2
+ marginTop: theme.spacing(0.5),
+ marginBottom: theme.spacing(0.5)
}
});
diff --git a/src/client/components/facet_bar/HierarchicalFacet.js b/src/client/components/facet_bar/HierarchicalFacet.js
index c5f92130..9b587a3f 100644
--- a/src/client/components/facet_bar/HierarchicalFacet.js
+++ b/src/client/components/facet_bar/HierarchicalFacet.js
@@ -187,14 +187,16 @@ class HierarchicalFacet extends Component {
let count = node.totalInstanceCount == null || node.totalInstanceCount == 0 ? node.instanceCount : node.totalInstanceCount;
return (
<React.Fragment>
- <a
- className={this.props.classes.facetLink}
- target='_blank' rel='noopener noreferrer'
- href={node.id}
- >
- {node.prefLabel}
- </a>
- <span> ({count})</span>
+ <Typography variant='body2'>
+ <a
+ className={this.props.classes.facetLink}
+ target='_blank' rel='noopener noreferrer'
+ href={node.id}
+ >
+ {node.prefLabel}
+ </a>
+ <span> ({count})</span>
+ </Typography>
</React.Fragment>
);
}
diff --git a/src/client/components/facet_bar/TextFacet.js b/src/client/components/facet_bar/TextFacet.js
index 3f632808..51a9bc8e 100644
--- a/src/client/components/facet_bar/TextFacet.js
+++ b/src/client/components/facet_bar/TextFacet.js
@@ -11,7 +11,7 @@ import CircularProgress from '@material-ui/core/CircularProgress';
const styles = theme => ({
textSearch: {
- margin: theme.spacing.unit,
+ margin: theme.spacing(1),
},
});
diff --git a/src/client/components/facet_results/Deck.js b/src/client/components/facet_results/Deck.js
index c9563c18..d59d6c6a 100644
--- a/src/client/components/facet_results/Deck.js
+++ b/src/client/components/facet_results/Deck.js
@@ -50,13 +50,13 @@ const styles = theme => ({
},
mapControls: {
position: 'absolute',
- left: theme.spacing.unit,
- top: theme.spacing.unit
+ left: theme.spacing(1),
+ top: theme.spacing(1)
},
legend: {
position: 'absolute',
- right: theme.spacing.unit,
- top: theme.spacing.unit,
+ right: theme.spacing(1),
+ top: theme.spacing(1),
},
red: {
color: 'rgba(255,0,0,255)'
diff --git a/src/client/components/facet_results/Pie.js b/src/client/components/facet_results/Pie.js
index 0f0264ac..bed00775 100644
--- a/src/client/components/facet_results/Pie.js
+++ b/src/client/components/facet_results/Pie.js
@@ -4,7 +4,7 @@ import {
VictoryPie,
VictoryLegend,
VictoryContainer,
- VictoryLabel,
+ //VictoryLabel,
} from 'victory';
import PieTooltip from './PieTooltip';
import _ from 'lodash';
@@ -27,12 +27,12 @@ const styles = theme => ({
alignItems: 'center'
},
pie: {
- paddingLeft: theme.spacing.unit * 4,
- paddingRight: theme.spacing.unit * 2,
+ paddingLeft: theme.spacing(4),
+ paddingRight: theme.spacing(2),
},
legend: {
- paddingLeft: theme.spacing.unit * 2,
- paddingRight: theme.spacing.unit * 4,
+ paddingLeft: theme.spacing(2),
+ paddingRight: theme.spacing(4),
},
legendPaper: {
height: 275,
diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js
index f9b1f5a9..a53015ba 100644
--- a/src/client/components/facet_results/ResultTable.js
+++ b/src/client/components/facet_results/ResultTable.js
@@ -153,7 +153,7 @@ class ResultTable extends React.Component {
count={resultCount}
rowsPerPage={pagesize}
rowsPerPageOptions={[5]}
- page={page}
+ page={page == -1 ? 0 : page}
onChangePage={this.handleChangePage}
onChangeRowsPerPage={this.handleOnchangeRowsPerPage}
ActionsComponent={ResultTablePaginationActions}
diff --git a/src/client/components/facet_results/ResultTablePaginationActions.js b/src/client/components/facet_results/ResultTablePaginationActions.js
index 445c7138..934cb664 100644
--- a/src/client/components/facet_results/ResultTablePaginationActions.js
+++ b/src/client/components/facet_results/ResultTablePaginationActions.js
@@ -11,7 +11,7 @@ const styles = theme => ({
root: {
flexShrink: 0,
color: theme.palette.text.secondary,
- marginLeft: theme.spacing.unit * 2.5,
+ marginLeft: theme.spacing(2.5),
},
});
diff --git a/src/client/components/main_layout/Footer.js b/src/client/components/main_layout/Footer.js
index dfa7e63e..7bd8d7f4 100644
--- a/src/client/components/main_layout/Footer.js
+++ b/src/client/components/main_layout/Footer.js
@@ -30,11 +30,11 @@ const styles = theme => ({
layout: {
width: 'auto',
height: 115,
- marginTop: theme.spacing.unit,
- marginBottom: theme.spacing.unit,
- marginLeft: theme.spacing.unit * 2,
- marginRight: theme.spacing.unit * 2,
- [theme.breakpoints.up(1500 + theme.spacing.unit * 3 * 2)]: {
+ marginTop: theme.spacing(1),
+ marginBottom: theme.spacing(1),
+ marginLeft: theme.spacing(2),
+ marginRight: theme.spacing(2),
+ [theme.breakpoints.up(1500 + theme.spacing(6))]: {
width: 1500,
marginLeft: 'auto',
marginRight: 'auto',
@@ -58,7 +58,7 @@ const Footer = props => {
return (
<Paper className={classes.root}>
<Grid container className={classes.layout}>
- <Grid container spacing={24} item xs={12}>
+ <Grid container spacing={3} item xs={12}>
<Grid item xs className={classes.logoContainer}>
<img className={classes.logo} src={oxfordLogo} alt='logo' />
</Grid>
@@ -78,7 +78,7 @@ const Footer = props => {
<img className={classes.aaltoLogo} src={aaltoLogo} alt='logo' />
</Grid>
</Grid>
- <Grid container spacing={24} item xs={12}>
+ <Grid container spacing={3} item xs={12}>
<Grid item xs className={classes.logoContainer}>
<img className={classes.logo} src={tapLogo} alt='logo' />
</Grid>
diff --git a/src/client/components/main_layout/Main.js b/src/client/components/main_layout/Main.js
index 2a9f37ca..b21f0c23 100644
--- a/src/client/components/main_layout/Main.js
+++ b/src/client/components/main_layout/Main.js
@@ -14,28 +14,28 @@ import thumbImage from '../../img/thumb.png';
const styles = theme => ({
root: {
width: '100%',
- marginBottom: theme.spacing.unit,
+ marginBottom: theme.spacing(1),
[ theme.breakpoints.up('md')]: {
height: 'calc(100% - 150px)',
overflow: 'auto',
},
},
icon: {
- marginRight: theme.spacing.unit * 2,
+ marginRight: theme.spacing(2),
},
// heroUnit: {
// backgroundColor: 'rgb(238, 238, 238)'
// },
heroContent: {
maxWidth: 1100,
- paddingTop: theme.spacing.unit * 3,
- paddingBottom: theme.spacing.unit
+ paddingTop: theme.spacing(3),
+ paddingBottom: theme.spacing(1)
},
layout: {
width: 'auto',
- marginLeft: theme.spacing.unit * 3,
- marginRight: theme.spacing.unit * 3,
- [theme.breakpoints.up(1100 + theme.spacing.unit * 3 * 2)]: {
+ marginLeft: theme.spacing(3),
+ marginRight: theme.spacing(3),
+ [theme.breakpoints.up(1100 + theme.spacing(6))]: {
width: 1100,
marginLeft: 'auto',
marginRight: 'auto',
@@ -102,7 +102,7 @@ let Main = props => {
</div>
</div>
<div className={classNames(classes.layout, classes.cardGrid)}>
- <Grid container spacing={40}>
+ <Grid container spacing={5}>
{perspectives.map(perspective =>
<Grid key={perspective.id} item xs={12} sm={6} md={4}>
<Card className={classes.card}>
diff --git a/src/client/components/main_layout/TopBar.js b/src/client/components/main_layout/TopBar.js
index dbc416a5..60bcad4c 100644
--- a/src/client/components/main_layout/TopBar.js
+++ b/src/client/components/main_layout/TopBar.js
@@ -20,7 +20,7 @@ const styles = theme => ({
flexGrow: 1,
},
title: {
- //
+ //
},
sectionDesktop: {
display: 'none',
@@ -70,6 +70,9 @@ class TopBar extends React.Component {
const { mobileMoreAnchorEl } = this.state;
const { classes } = this.props;
const isMobileMenuOpen = Boolean(mobileMoreAnchorEl);
+ // https://material-ui.com/components/buttons/#third-party-routing-library
+ const AdapterLink = React.forwardRef((props, ref) => <Link innerRef={ref} {...props} />);
+ const AdapterNavLink = React.forwardRef((props, ref) => <NavLink innerRef={ref} {...props} />);
const perspectives = [ 'manuscripts', 'works', 'events', 'people',
'organizations', 'places' ];
@@ -85,7 +88,7 @@ class TopBar extends React.Component {
{perspectives.map(perspective =>
<MenuItem
key={perspective}
- component={Link}
+ component={AdapterLink}
to={`/${perspective}`}
>
{perspective.toUpperCase()}
@@ -94,13 +97,15 @@ class TopBar extends React.Component {
</Menu>
);
+
+
return (
<div className={classes.root}>
<AppBar position="absolute">
<Toolbar>
<Button
className={classes.appBarButton}
- component={Link}
+ component={AdapterLink}
to='/'
>
<Typography className={classes.title} variant="h6" color="inherit">
@@ -117,7 +122,7 @@ class TopBar extends React.Component {
<Button
key={perspective}
className={classes.appBarButton}
- component={NavLink}
+ component={AdapterNavLink}
to={`/${perspective}`}
isActive={(match, location) => location.pathname.startsWith(`/${perspective}`)}
activeClassName={classes.appBarButtonActive}
diff --git a/src/client/components/main_layout/TopBarSearchField.js b/src/client/components/main_layout/TopBarSearchField.js
index 38b5026a..8f1fe48b 100644
--- a/src/client/components/main_layout/TopBarSearchField.js
+++ b/src/client/components/main_layout/TopBarSearchField.js
@@ -15,16 +15,16 @@ const styles = theme => ({
'&:hover': {
backgroundColor: fade(theme.palette.common.white, 0.25),
},
- marginRight: theme.spacing.unit * 2,
- marginLeft: theme.spacing.unit * 2,
+ marginRight: theme.spacing(2),
+ marginLeft: theme.spacing(2),
width: '100%',
[theme.breakpoints.up('sm')]: {
- marginLeft: theme.spacing.unit * 3,
+ marginLeft: theme.spacing(3),
width: 'auto',
},
},
searchIcon: {
- width: theme.spacing.unit * 9,
+ width: theme.spacing(9),
height: '100%',
position: 'absolute',
pointerEvents: 'none',
@@ -37,10 +37,10 @@ const styles = theme => ({
width: '100%',
},
inputInput: {
- paddingTop: theme.spacing.unit,
- paddingRight: theme.spacing.unit,
- paddingBottom: theme.spacing.unit,
- paddingLeft: theme.spacing.unit * 10,
+ paddingTop: theme.spacing(1),
+ paddingRight: theme.spacing(1),
+ paddingBottom: theme.spacing(1),
+ paddingLeft: theme.spacing(10),
transition: theme.transitions.create('width'),
width: '100%',
[theme.breakpoints.up('md')]: {
diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 23b4e0eb..fc386ccf 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -58,7 +58,7 @@ const styles = theme => ({
mainContainer: {
height: 'auto',
backgroundColor: '#bdbdbd',
- padding: theme.spacing.unit,
+ padding: theme.spacing(1),
[theme.breakpoints.down('sm')]: {
marginTop: 56,
height: 'calc(100% - 56px)',
@@ -99,7 +99,7 @@ let SemanticPortal = (props) => {
fetchResultsClientSide={props.fetchResultsClientSide}
clearResults={props.clearResults}
/>
- <Grid container spacing={8} className={classes.mainContainer}>
+ <Grid container spacing={1} className={classes.mainContainer}>
<Route
exact path="/"
render={() =>
--
GitLab