diff --git a/client/package.json b/client/package.json index c42743de..9d723675 100644 --- a/client/package.json +++ b/client/package.json @@ -9,17 +9,17 @@ "@types/lodash.debounce": "^4.0.6", "@types/lodash.merge": "^4.6.6", "@types/lodash.sortby": "^4.7.6", - "@types/node": "13.7.4", + "@types/node": "13.7.6", "@types/numeral": "^0.0.26", "@types/qrcode.react": "^1.0.0", - "@types/react": "16.9.21", + "@types/react": "16.9.23", "@types/react-copy-to-clipboard": "^4.3.0", "@types/react-dom": "16.9.5", "@types/react-modal": "^3.10.5", "@types/react-qr-reader": "^2.1.2", "@types/react-router-dom": "^5.1.2", "@types/react-tooltip": "^3.11.0", - "@types/styled-components": "^4.4.3", + "@types/styled-components": "^5.0.1", "@types/styled-react-modal": "^1.2.0", "@types/styled-theming": "^2.2.2", "@types/victory": "^33.1.4", @@ -27,7 +27,7 @@ "apollo-boost": "^0.4.4", "base64url": "^3.0.1", "crypto-js": "^4.0.0", - "date-fns": "^2.8.0", + "date-fns": "^2.10.0", "graphql": "^14.6.0", "lodash.debounce": "^4.0.8", "lodash.merge": "^4.6.2", @@ -45,11 +45,11 @@ "react-spring": "^8.0.27", "react-toastify": "^5.4.1", "react-tooltip": "^4.0.3", - "snyk": "^1.294.1", + "snyk": "^1.297.1", "styled-components": "^5.0.1", "styled-react-modal": "^2.0.0", "styled-theming": "^2.2.0", - "typescript": "^3.7.2", + "typescript": "^3.8.2", "victory": "^34.1.1", "zxcvbn": "^4.4.2" }, @@ -78,14 +78,14 @@ ] }, "devDependencies": { - "@storybook/addon-actions": "^5.3.13", - "@storybook/addon-info": "^5.3.13", - "@storybook/addon-knobs": "^5.3.13", - "@storybook/addon-links": "^5.3.13", - "@storybook/addon-viewport": "^5.3.13", - "@storybook/addons": "^5.3.13", + "@storybook/addon-actions": "^5.3.14", + "@storybook/addon-info": "^5.3.14", + "@storybook/addon-knobs": "^5.3.14", + "@storybook/addon-links": "^5.3.14", + "@storybook/addon-viewport": "^5.3.14", + "@storybook/addons": "^5.3.14", "@storybook/preset-create-react-app": "^1.5.2", - "@storybook/react": "^5.3.13", + "@storybook/react": "^5.3.14", "awesome-typescript-loader": "^5.2.1", "husky": "^4.2.3", "prettier": "1.19.1", diff --git a/client/src/components/auth/checks/AdminCheck.tsx b/client/src/components/auth/checks/AdminCheck.tsx index 25f69cb4..3eef7c96 100644 --- a/client/src/components/auth/checks/AdminCheck.tsx +++ b/client/src/components/auth/checks/AdminCheck.tsx @@ -10,7 +10,7 @@ import { XSvg, Check } from 'components/generic/Icons'; type AdminProps = { host: string; admin: string; - cert: string; + cert?: string; setChecked: (state: boolean) => void; }; diff --git a/client/src/components/auth/checks/ViewCheck.tsx b/client/src/components/auth/checks/ViewCheck.tsx index 15c3eb43..847994f2 100644 --- a/client/src/components/auth/checks/ViewCheck.tsx +++ b/client/src/components/auth/checks/ViewCheck.tsx @@ -12,9 +12,9 @@ import { Text } from 'views/other/OtherViews.styled'; type ViewProps = { host: string; - admin: string; - viewOnly: string; - cert: string; + admin?: string; + viewOnly?: string; + cert?: string; adminChecked: boolean; callback: () => void; setAdminChecked: (state: boolean) => void; @@ -34,7 +34,7 @@ export const ViewCheck = ({ const [confirmed, setConfirmed] = useState(false); const { data, loading } = useQuery(GET_CAN_CONNECT, { - variables: { auth: getAuthString(host, viewOnly ?? admin, cert) }, + variables: { auth: getAuthString(host, viewOnly ?? admin ?? '', cert) }, onCompleted: () => setConfirmed(true), onError: () => setConfirmed(false), }); @@ -138,12 +138,14 @@ export const ViewCheck = ({ View-Only Macaroon {content()} - + {admin && ( + + )} {renderButton()} ); diff --git a/client/src/components/auth/index.tsx b/client/src/components/auth/index.tsx index 9d8072ac..2a1020b8 100644 --- a/client/src/components/auth/index.tsx +++ b/client/src/components/auth/index.tsx @@ -12,6 +12,7 @@ import { saveUserAuth } from 'utils/auth'; import { PasswordInput } from './views/Password'; import { useConnectionDispatch } from 'context/ConnectionContext'; import { useStatusDispatch } from 'context/StatusContext'; +import { toast } from 'react-toastify'; type AuthProps = { type: string; @@ -29,12 +30,12 @@ export const Auth = ({ type, status, callback, setStatus }: AuthProps) => { const dispatch = useConnectionDispatch(); const dispatchState = useStatusDispatch(); - const [name, setName] = useState(); - const [host, setHost] = useState(); - const [admin, setAdmin] = useState(); - const [viewOnly, setViewOnly] = useState(); - const [cert, setCert] = useState(); - const [password, setPassword] = useState(); + const [name, setName] = useState(); + const [host, setHost] = useState(); + const [admin, setAdmin] = useState(); + const [viewOnly, setViewOnly] = useState(); + const [cert, setCert] = useState(); + const [password, setPassword] = useState(); const [adminChecked, setAdminChecked] = useState(false); @@ -53,7 +54,11 @@ export const Auth = ({ type, status, callback, setStatus }: AuthProps) => { cert?: string; skipCheck?: boolean; }) => { - if (skipCheck) { + if (!host) { + toast.error('A host url is needed to connect.'); + } else if (!admin && !viewOnly) { + toast.error('View-Only or Admin macaroon are needed to connect.'); + } else if (skipCheck) { quickSave({ name, cert, admin, viewOnly, host }); } else { name && setName(name); @@ -96,25 +101,31 @@ export const Auth = ({ type, status, callback, setStatus }: AuthProps) => { }; const handleSave = () => { - const encryptedAdmin = - admin && password - ? CryptoJS.AES.encrypt(admin, password).toString() - : undefined; + if (!host) { + toast.error('A host url is needed to connect.'); + } else if (!admin && !viewOnly) { + toast.error('View-Only or Admin macaroon are needed to connect.'); + } else { + const encryptedAdmin = + admin && password + ? CryptoJS.AES.encrypt(admin, password).toString() + : undefined; - saveUserAuth({ - available: next, - name, - host, - admin: encryptedAdmin, - viewOnly, - cert, - }); + saveUserAuth({ + available: next, + name, + host, + admin: encryptedAdmin, + viewOnly, + cert, + }); - dispatch({ type: 'disconnected' }); - dispatchState({ type: 'disconnected' }); - changeAccount(next); + dispatch({ type: 'disconnected' }); + dispatchState({ type: 'disconnected' }); + changeAccount(next); - push('/'); + push('/'); + } }; const handleConnect = () => { @@ -141,7 +152,7 @@ export const Auth = ({ type, status, callback, setStatus }: AuthProps) => { return ( <> {status === 'none' && renderView()} - {status === 'confirmNode' && ( + {status === 'confirmNode' && host && ( void; callback: () => void; loading: boolean; @@ -20,7 +20,7 @@ export const PasswordInput = ({ loading = false, }: PasswordProps) => { const strength = (100 * Math.min(zxcvbn(isPass).guesses_log10, 40)) / 40; - const needed = 20; + const needed = process.env.NODE_ENV === 'development' ? 1 : 20; return ( <> Please Input a Password diff --git a/client/src/utils/auth.ts b/client/src/utils/auth.ts index fd379fcb..86fcd89c 100644 --- a/client/src/utils/auth.ts +++ b/client/src/utils/auth.ts @@ -31,7 +31,7 @@ export const saveUserAuth = ({ }: BuildProps) => { localStorage.setItem('account', `auth${available}`); localStorage.setItem(`auth${available}-host`, host); - localStorage.setItem(`auth${available}-name`, name ? name : 'no name'); + localStorage.setItem(`auth${available}-name`, name ? name : `${available}`); admin && localStorage.setItem(`auth${available}-admin`, admin); viewOnly && localStorage.setItem(`auth${available}-read`, viewOnly); cert && localStorage.setItem(`auth${available}-cert`, cert); diff --git a/client/src/views/balance/Balance.tsx b/client/src/views/balance/Balance.tsx index 21dadb84..512e390d 100644 --- a/client/src/views/balance/Balance.tsx +++ b/client/src/views/balance/Balance.tsx @@ -34,11 +34,11 @@ export const BalanceView = () => { cert, ); - const [outgoing, setOutgoing] = useState(); + const [outgoing, setOutgoing] = useState<{ id: string } | null>(); const [incoming, setIncoming] = useState(); - const [amount, setAmount] = useState(); + const [amount, setAmount] = useState(); - const [maxFee, setMaxFee] = useState(); + const [maxFee, setMaxFee] = useState(); const [blocked, setBlocked] = useState(false); @@ -176,7 +176,7 @@ export const BalanceView = () => { Amount - + @@ -195,7 +195,7 @@ export const BalanceView = () => { Max Fee - + @@ -210,7 +210,7 @@ export const BalanceView = () => { withMargin={'0 0 24px'} /> )} - {incoming && outgoing && ( + {incoming && outgoing && amount && ( void; diff --git a/client/yarn.lock b/client/yarn.lock index 17b0609c..e2e52e7d 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1482,6 +1482,13 @@ dependencies: tslib "^1.9.3" +"@snyk/cli-interface@2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.3.2.tgz#e93afa82de15b912e657f1ba86f9d7963983e594" + integrity sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg== + dependencies: + tslib "^1.9.3" + "@snyk/cocoapods-lockfile-parser@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.0.0.tgz#514b744cedd9d3d3efb2a5d06fce1662fec2ff1a" @@ -1577,17 +1584,17 @@ semver-diff "^2.0.0" xdg-basedir "^3.0.0" -"@storybook/addon-actions@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.13.tgz#faf57ca14a46ce0c69168c631fbfc3d79d294b38" - integrity sha512-NoKTI/7Zf/IpbfeIFPWQT3eN0As1yICLcSklj9BjHq7itSssaqZzvP/vxmeAvdagIBcPM58GaN9XXXLQIn5HLg== +"@storybook/addon-actions@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.14.tgz#aacc4d2703fc200a4565bfaa9f5870ed70a6fe32" + integrity sha512-4lKrTMzw/r6VQiBY24v72WC3jibW7pc9BIJgtPpTmTUQWTxPnkmxDfT81pV4BjS1GFH9VCnU6f5fWK+5lrQlsw== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/api" "5.3.13" - "@storybook/client-api" "5.3.13" - "@storybook/components" "5.3.13" - "@storybook/core-events" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/api" "5.3.14" + "@storybook/client-api" "5.3.14" + "@storybook/components" "5.3.14" + "@storybook/core-events" "5.3.14" + "@storybook/theming" "5.3.14" core-js "^3.0.1" fast-deep-equal "^2.0.1" global "^4.3.2" @@ -1597,15 +1604,15 @@ react-inspector "^4.0.0" uuid "^3.3.2" -"@storybook/addon-info@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-5.3.13.tgz#8b10bd5ae09390486ec48ce209eff0b6a2bb5b21" - integrity sha512-pH/ZJ/wuuZ2X1vxoLeO97/M4KVaWPt+YR6kY/abw+7Z1PG80DUW3saBcRmb+pexnBVReHe0MFAb3vo57l+MwCA== +"@storybook/addon-info@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-5.3.14.tgz#2d5309f12816ff51c5a141616133a2701b39173b" + integrity sha512-xZCR1OmOIT2zz0r22PSMCUvcIqCWxTTpAc3R8ByJts9j/FxlvMerAgPYhZ8R9WNFEjG2Mszwyw66pU7Oj+qipg== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/components" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/components" "5.3.14" + "@storybook/theming" "5.3.14" core-js "^3.0.1" global "^4.3.2" marksy "^8.0.0" @@ -1618,17 +1625,17 @@ react-lifecycles-compat "^3.0.4" util-deprecate "^1.0.2" -"@storybook/addon-knobs@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.3.13.tgz#fe8be71eadd118edf19656442388e2e7262d2fad" - integrity sha512-Ef3D8bbV+6fywjR4JUX699gT7ZfuNBXlXqZB1qgGde5swbuttEGty1+RRwK1fqIeBr6EbzPvhRBTVOFIQp5Ysg== +"@storybook/addon-knobs@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.3.14.tgz#b8b753c7e64f7087668396d66aee253a51717a2d" + integrity sha512-pBpFOdeCR8n8w6QHK1adABt6YKf+Q4itfX0+AtZRGLvbGum9O+paihvP9EVYPlKiG+0T7Zv2vFCl6q6qFjF/Mw== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/api" "5.3.13" - "@storybook/client-api" "5.3.13" - "@storybook/components" "5.3.13" - "@storybook/core-events" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/api" "5.3.14" + "@storybook/client-api" "5.3.14" + "@storybook/components" "5.3.14" + "@storybook/core-events" "5.3.14" + "@storybook/theming" "5.3.14" "@types/react-color" "^3.0.1" copy-to-clipboard "^3.0.8" core-js "^3.0.1" @@ -1642,64 +1649,64 @@ react-lifecycles-compat "^3.0.4" react-select "^3.0.8" -"@storybook/addon-links@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-5.3.13.tgz#c783979b57949b33d2cee3ad83fa84069ec26774" - integrity sha512-pMX205RM2/pEW5Sdq8nXAwMnVQPCofEmQjCiePw4awrAFqje6jmzZttjwImfzbc0BWtYDc1J97loI/Spo2q55A== +"@storybook/addon-links@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-5.3.14.tgz#67756a27b7d3d13163f4bd0679b91e9cc90ada5f" + integrity sha512-6qr6PNw7eCwGZ1OwApG7yiUUE+zhVzXIkxZFq3bVIreFnkNbH+nAA4pvHjKdeHK8jmTyj/ifJdiFXZSUIRhuLw== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/core-events" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/core-events" "5.3.14" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.13" + "@storybook/router" "5.3.14" core-js "^3.0.1" global "^4.3.2" prop-types "^15.7.2" qs "^6.6.0" ts-dedent "^1.1.0" -"@storybook/addon-viewport@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-5.3.13.tgz#4a1ea684da2bb444dbe0653d0a27eb8a72cc2c94" - integrity sha512-sFhWhyhN1k9VdSXPRkO7QMy1MLib9m6YtBzPCTnNsz8CjAuMNtCA+7zNW/fqGGJAHxuVTTJaHRc51Zk35E4WJA== +"@storybook/addon-viewport@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-5.3.14.tgz#7ec4b4f9f248525438a9669a2f2d2615f4766153" + integrity sha512-Eg/aP9I3csltaArXvPzhQZuXnAc4FVMo4BcVFTzNx93zaXYVDSLCoTFBAz4NWrnuJuLw9cdSKirJ2lsuu6ABeg== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/api" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/components" "5.3.13" - "@storybook/core-events" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/api" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/components" "5.3.14" + "@storybook/core-events" "5.3.14" + "@storybook/theming" "5.3.14" core-js "^3.0.1" global "^4.3.2" memoizerific "^1.11.3" prop-types "^15.7.2" util-deprecate "^1.0.2" -"@storybook/addons@5.3.13", "@storybook/addons@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.13.tgz#8c16fbab1142e2cd4bdfb93ffcb35a883dac2866" - integrity sha512-Yjn8PXhSYw4bnB/l8ybhMw3eqpJlV3HlwMECYhRtVm+wTqal9OQlZkam5xclWm6PF/6DhyiPCt6vlXN3vfVGPA== +"@storybook/addons@5.3.14", "@storybook/addons@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.14.tgz#ff96c2c46a617f777c3660395017d2aef5319f19" + integrity sha512-zoN1MYlArdThp93i+Ogil/pihyx8n7nkrdSO0j9HUh6jUsGeFFEluPQZdRFte9NIoY6ZWSWwuEMDgrv2Pw9r2Q== dependencies: - "@storybook/api" "5.3.13" - "@storybook/channels" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/core-events" "5.3.13" + "@storybook/api" "5.3.14" + "@storybook/channels" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/core-events" "5.3.14" core-js "^3.0.1" global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/api@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.13.tgz#51cbdb461ff2ee8468a3c54411f42f07aa307f5d" - integrity sha512-ZOBUOz0aRPD7w8UngcVOjwcXt417Zboi0ERW+Atn22ZUYqI3zri8M9EerLHvyKw7J42/gEIqQqg5PyfPcLJmeQ== +"@storybook/api@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.14.tgz#8c2bb226a4a5de7974ee2ccce36986b72f462f1b" + integrity sha512-ANWRMTLEoAfu0IsXqbxmbTpxS8xTByZgLj20tH96bxgH1rJo9KAZnJ8A9kGYr+zklU8QnYvVIgmV3HESXII9zg== dependencies: "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/core-events" "5.3.13" + "@storybook/channels" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/core-events" "5.3.14" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/router" "5.3.14" + "@storybook/theming" "5.3.14" "@types/reach__router" "^1.2.3" core-js "^3.0.1" fast-deep-equal "^2.0.1" @@ -1714,34 +1721,34 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/channel-postmessage@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.13.tgz#80cf8136bf4b96b2f9b291d3cc81e5d02abecc98" - integrity sha512-FMrl49ipHPXB0XPuwXm/2GWM5b53iFFz9V4/SQC1s31kxAU99QFmWXWvRKbM29FpAVHvTdjQllIiOWgdTH8jAA== +"@storybook/channel-postmessage@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.14.tgz#768c87411d98caf09fdd92539b9edaaed26d5965" + integrity sha512-XKHxMSwW3movfTDOashuYlVCX3Hp7+X+amXc/xhDDzbiYjy3/CVm3LlkkM6v451IVEdK6pue4ewqZQWJAYAAEQ== dependencies: - "@storybook/channels" "5.3.13" - "@storybook/client-logger" "5.3.13" + "@storybook/channels" "5.3.14" + "@storybook/client-logger" "5.3.14" core-js "^3.0.1" global "^4.3.2" telejson "^3.2.0" -"@storybook/channels@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.13.tgz#2adf4595988e2586f1a360cf4760f16338ffec26" - integrity sha512-lD4HXmfoKJAnAlAYwQJ5dDXG3WnW7jpW3wJieRwvQGDFHQSXdJ3Lv5/zv2y+TM06Jx8O2esaepNw+VzjMw3/Qg== +"@storybook/channels@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.14.tgz#9969e27761a80afb495bc1475f0173f9b6ef5a76" + integrity sha512-k9QBf9Kwe+iGmdEK/kW5xprqem2SPfBVwET6LWvJkWOl9UQ9VoMuCHgV55p0tzjcugaqWWKoF9+FRMWxWRfsQg== dependencies: core-js "^3.0.1" -"@storybook/client-api@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.13.tgz#0d41ae3846a6ae2ebbbeef0ca945c3ee6448ba2e" - integrity sha512-GZCFtpU764X8TW+RYRNybIGHKJOa2fYW28I0hEPXXE0J4BeU4Z++SCeNhVBa+0tPoQ3jbsdA7M4Q5Q5UeaG2Nw== +"@storybook/client-api@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.14.tgz#5f4b199d2f2b193f9f5a856c5eb8be43a9113d12" + integrity sha512-1qx1NIwto5F9N24Fb6VzKyDzeaZHtWTZ7afPrg56e1tUu7jbog7rELdRezk8+YAujveyMDJu4MxnOSP01sv7YQ== dependencies: - "@storybook/addons" "5.3.13" - "@storybook/channel-postmessage" "5.3.13" - "@storybook/channels" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/core-events" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/channel-postmessage" "5.3.14" + "@storybook/channels" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/core-events" "5.3.14" "@storybook/csf" "0.0.1" "@types/webpack-env" "^1.15.0" core-js "^3.0.1" @@ -1755,20 +1762,20 @@ ts-dedent "^1.1.0" util-deprecate "^1.0.2" -"@storybook/client-logger@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.13.tgz#1c2abf0fc53009cf159eb76e30cf32ce2b9327b1" - integrity sha512-unfhCgsGWWqNpM8t8S5coDcTgpWtOq3Kj4LEHivNjdHZFdf8WMLidW79ZTiyk/Nzx7RvZKgkvf7f6EtZniD55w== +"@storybook/client-logger@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.14.tgz#85068f1b665a52163191eb5976f1581bce6df0e4" + integrity sha512-YCHEsOvo6zPb4udlyAwqr5W0Kv9mAEQmcX73w9IDvAxbjR00T7empW7qmbjvviftKB/5MEgDdiYbj64ccs3aqg== dependencies: core-js "^3.0.1" -"@storybook/components@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.13.tgz#646f8347ffa38298e3f9c1d15866c2167f577027" - integrity sha512-AwMnLCStwqLWsBzXp7m/QXuJin//0l4FH+OXmnD/6GC8qEy4JuutEOPW35IE/Mp9KAvbapHcnPTRMmDohUsTcw== +"@storybook/components@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.14.tgz#0f2f90113674e14ee74d5d16d6b3b1220cb0fa16" + integrity sha512-AsjkIFBrrqcBDLxGdmUHiauZo5gOL65eXx8WA7/yJDF8s45VVZX5Z0buOnjFyEhGVus02gwTov8da2irjL862A== dependencies: - "@storybook/client-logger" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/client-logger" "5.3.14" + "@storybook/theming" "5.3.14" "@types/react-syntax-highlighter" "11.0.2" "@types/react-textarea-autosize" "^4.3.3" core-js "^3.0.1" @@ -1789,33 +1796,33 @@ simplebar-react "^1.0.0-alpha.6" ts-dedent "^1.1.0" -"@storybook/core-events@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.13.tgz#df74d2ffe29a1924557dc67e46d5d399893b2b11" - integrity sha512-RAnQe/I+1Ri+aYGhaNn07467cyespNX9R9i1AzFT/baBOQF2N+998mfgRu4/i/Q9YuOXIyHhw1a7JHbE/8e1lw== +"@storybook/core-events@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.14.tgz#d476eea7032670db1a84bef7e5baadb04c2de529" + integrity sha512-VCPLKqRugsOSx/smMJiJOvRgAzTrMpsbRuFw48kBGkQMP9TEV82Qe/341dv+f4GllPyBZyANG0p0m5+w7ZCURQ== dependencies: core-js "^3.0.1" -"@storybook/core@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.13.tgz#a6653befc867aa46bb53b43c1f4b8c51a9aa5845" - integrity sha512-HS//95j14XOb9ChYJBDHyZKAqFD2WsUh1q7sMMynSpKgHJjyfYI12rwxH5vDIrJ7CLBQbrMWrgOITjB9/cLJKA== +"@storybook/core@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.14.tgz#510f204219695045f249733bf94018e52c7b1448" + integrity sha512-Y57cchCRw1vvZe8OhMmgAkaHciGLm2eztdfzZMUmeHH8csBt/0RO5gYzOhWDGgdC2D9HSlaysZEDJ6sH3PChlw== dependencies: "@babel/plugin-proposal-class-properties" "^7.7.0" "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-transform-react-constant-elements" "^7.2.0" "@babel/preset-env" "^7.4.5" - "@storybook/addons" "5.3.13" - "@storybook/channel-postmessage" "5.3.13" - "@storybook/client-api" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/core-events" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/channel-postmessage" "5.3.14" + "@storybook/client-api" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/core-events" "5.3.14" "@storybook/csf" "0.0.1" - "@storybook/node-logger" "5.3.13" - "@storybook/router" "5.3.13" - "@storybook/theming" "5.3.13" - "@storybook/ui" "5.3.13" + "@storybook/node-logger" "5.3.14" + "@storybook/router" "5.3.14" + "@storybook/theming" "5.3.14" + "@storybook/ui" "5.3.14" airbnb-js-shims "^2.2.1" ansi-to-html "^0.6.11" autoprefixer "^9.7.2" @@ -1882,10 +1889,10 @@ dependencies: lodash "^4.17.15" -"@storybook/node-logger@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.13.tgz#f41c611c3b200add8d85777f19970bdabaa94634" - integrity sha512-ZpuyKALHq/ZyynXnsW254JaULWZLPBFw007tkJhE5z/CLy059cIVovQhX/8Ivt3FG3qwWmcqQ0ISHFi0dJpqnA== +"@storybook/node-logger@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.14.tgz#5e4e02585b37754bbebb8810ffb17c8ce706a1f8" + integrity sha512-/phRS49/hMZ5SU4EKUxX2kFepm9iw1cJBzggOz0GA1Yj4r9g1TA1H+OD7QvZvVTC3AESf/ZUJyaqnXEh/l+hpg== dependencies: "@types/npmlog" "^4.1.2" chalk "^3.0.0" @@ -1916,17 +1923,17 @@ react-docgen-typescript-loader "^3.6.0" semver "^7.1.1" -"@storybook/react@^5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.3.13.tgz#b2daa820ffce6cd07d52e89d9ac823b9f5562637" - integrity sha512-McBwRjGbe6vgjSqdcDtVxKyjGhRGBaN6JLsRr/Bi49KM/sw9SpXuoYxCQVQjK5jMpUV+1UeEpS/5j7HNeVc6YA== +"@storybook/react@^5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.3.14.tgz#6715d9ee64e1c7b5c1e45cdbbf6df809bad60b8c" + integrity sha512-8n0oCkaxFMrimngxnISEQFkHGSF5z65Lh1XPypjIndIJ0b/IVWRJcUEh3M3xOaydFatEG+lfQbF/5OznyYEefA== dependencies: "@babel/plugin-transform-react-constant-elements" "^7.6.3" "@babel/preset-flow" "^7.0.0" "@babel/preset-react" "^7.0.0" - "@storybook/addons" "5.3.13" - "@storybook/core" "5.3.13" - "@storybook/node-logger" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/core" "5.3.14" + "@storybook/node-logger" "5.3.14" "@svgr/webpack" "^4.0.3" "@types/webpack-env" "^1.15.0" babel-plugin-add-react-displayname "^0.0.5" @@ -1943,10 +1950,10 @@ ts-dedent "^1.1.0" webpack "^4.33.0" -"@storybook/router@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.13.tgz#1ef971488036083ee284323fe8814b8795f94626" - integrity sha512-C6PNKHxKwpNHPeQkd9ZfsIBfSBTEhWEbn9cVMPSTrUyjfaGWxbKBP8zuBIXhezIv8B2gv2bQrT62hrmsXUcCVg== +"@storybook/router@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.14.tgz#6535267624da5f54971c37e497df1c161f65be8f" + integrity sha512-O0KwQFncdBeq+O2Aq8UAFBVWjWmP5rtqoacUOFSGkXgObOnyniEraLiPH7rPtq2dAlSpgYI9+srQAZfo52Hz2A== dependencies: "@reach/router" "^1.2.1" "@storybook/csf" "0.0.1" @@ -1958,14 +1965,14 @@ qs "^6.6.0" util-deprecate "^1.0.2" -"@storybook/theming@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.13.tgz#17e8101e2d3ad3fb6245b2cb15b07e9f2a9881cd" - integrity sha512-Zb07pDt8Sv5uq+xDW3TsiTXS9IGwUNwpkR6UQgKILFJ7HX2q4Tt9r+wIi1QCwozcROx4w/bP/8MAKpEAT212lw== +"@storybook/theming@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.14.tgz#4923739ad0d7d673b7844f27da8a3c6cf118790f" + integrity sha512-raqXC3yJycEt1CrCAfnBYUA6pyJI80E9M26EeQl3UfytJOL6euprOi+D17QvxqBn7jmmf9ZDw5XRkvJhQ17Y7Q== dependencies: "@emotion/core" "^10.0.20" "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.13" + "@storybook/client-logger" "5.3.14" core-js "^3.0.1" deep-object-diff "^1.1.0" emotion-theming "^10.0.19" @@ -1976,20 +1983,20 @@ resolve-from "^5.0.0" ts-dedent "^1.1.0" -"@storybook/ui@5.3.13": - version "5.3.13" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.13.tgz#c829bc1cbcd0995e4888056a9f43fbf8a7c22ee4" - integrity sha512-pEXWFPF097OjvbgwvMjLsjLsDViu6yBMmUcL+nd3jvtxyxkuzv5X+2J14N8Nz0veJysbp+5+5A8kKGTO+spZfA== +"@storybook/ui@5.3.14": + version "5.3.14" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.14.tgz#f3c49241d615bb20cb6facef84b4c432a85d814b" + integrity sha512-4zQOxpcvbKqRevmFw3Er6AWr2MeEMQfnuYh4Vm5G5YpiTyM6PU0VTVRzKnkEbNBcgjClD7nwXSbkUJjW6MJ8SA== dependencies: "@emotion/core" "^10.0.20" - "@storybook/addons" "5.3.13" - "@storybook/api" "5.3.13" - "@storybook/channels" "5.3.13" - "@storybook/client-logger" "5.3.13" - "@storybook/components" "5.3.13" - "@storybook/core-events" "5.3.13" - "@storybook/router" "5.3.13" - "@storybook/theming" "5.3.13" + "@storybook/addons" "5.3.14" + "@storybook/api" "5.3.14" + "@storybook/channels" "5.3.14" + "@storybook/client-logger" "5.3.14" + "@storybook/components" "5.3.14" + "@storybook/core-events" "5.3.14" + "@storybook/router" "5.3.14" + "@storybook/theming" "5.3.14" copy-to-clipboard "^3.0.8" core-js "^3.0.1" core-js-pure "^3.0.1" @@ -2298,10 +2305,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.0.tgz#4e498dbf355795a611a87ae5ef811a8660d42662" integrity sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ== -"@types/node@13.7.4": - version "13.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz#76c3cb3a12909510f52e5dc04a6298cdf9504ffd" - integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw== +"@types/node@13.7.6": + version "13.7.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.6.tgz#cb734a7c191472ae6a2b3a502b4dfffcea974113" + integrity sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA== "@types/node@^6.14.4": version "6.14.9" @@ -2436,10 +2443,10 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/react@16.9.21": - version "16.9.21" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz#99e274e2ecfab6bb93920e918341daa3198b348d" - integrity sha512-xpmenCMeBwJRct8vmIfczlgdOXWIWASoOM857kxKfHlVQvDltRh7IFRVfGws79iO2jkNPXOeWREyKoClzhBaQA== +"@types/react@16.9.23": + version "16.9.23" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c" + integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -2477,10 +2484,10 @@ "@types/react-native" "*" csstype "^2.2.0" -"@types/styled-components@^4.4.3": - version "4.4.3" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.4.3.tgz#74dd00ad760845a98890a8539361d8afc32059de" - integrity sha512-U0udeNOZBfUkJycmGJwmzun0FBt11rZy08weVQmE2xfUNAbX8AGOEWxWna2d+qAUKxKgMlcG+TZT0+K2FfDcnQ== +"@types/styled-components@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.0.1.tgz#44d210b0a0218a70df998d1a8e1f69c82d9cc68b" + integrity sha512-1yRYO1dAE2MGEuYKF1yQFeMdoyerIQn6ZDnFFkxZamcs3rn8RQVn98edPsTROAxbTz81tqnVN4BJ3Qs1cm/tKg== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" @@ -5400,10 +5407,10 @@ data-urls@^1.0.0, data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@^2.8.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.9.0.tgz#d0b175a5c37ed5f17b97e2272bbc1fa5aec677d2" - integrity sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA== +date-fns@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.10.0.tgz#abd10604d8bafb0bcbd2ba2e9b0563b922ae4b6b" + integrity sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA== debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" @@ -5657,10 +5664,10 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -dockerfile-ast@0.0.18: - version "0.0.18" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz#94a0ba84eb9b3e9fb7bd6beae0ea7eb6dcbca75a" - integrity sha512-SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ== +dockerfile-ast@0.0.19: + version "0.0.19" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz#b1e21138eba995d7bf5576dc30ba1130c15995c3" + integrity sha512-iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA== dependencies: vscode-languageserver-types "^3.5.0" @@ -13605,13 +13612,13 @@ snyk-config@^2.2.1: lodash "^4.17.15" nconf "^0.10.0" -snyk-docker-plugin@1.38.0: - version "1.38.0" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.38.0.tgz#afe0ac316e461b200bcd0063295a3f8bd3655e93" - integrity sha512-43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw== +snyk-docker-plugin@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-2.2.0.tgz#eb15f4854c53d96f591b99b8c8574fbf7ba6014b" + integrity sha512-adoerkNsYNNZFKnvtjJLJeEgjUf2js0hnG32aUJSRtbDN1Ejgbj88a0UYc90C+s2xZJaulJgImy9/5IsG5/omg== dependencies: debug "^4.1.1" - dockerfile-ast "0.0.18" + dockerfile-ast "0.0.19" event-loop-spinner "^1.1.0" semver "^6.1.0" tar-stream "^2.1.0" @@ -13636,10 +13643,10 @@ snyk-go-plugin@1.13.0: tmp "0.1.0" tslib "^1.10.0" -snyk-gradle-plugin@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.4.tgz#c1ff1dfbbe3c1a254d0da54a91c3f59c1b5582ca" - integrity sha512-XmS1gl7uZNHP9HP5RaPuRXW3VjkbdWe+EgSOlvmspztkubIOIainqc87k7rIJ6u3tLBhqsZK8b5ru0/E9Q69hQ== +snyk-gradle-plugin@3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.5.tgz#a0be7ddec568bfec62e7ebf7a6431aa74eec1d27" + integrity sha512-XxPi/B16dGkV1USoyFbpn6LlSJ9SUC6Y6z/4lWuF4spLnKtWwpEb1bwTdBFsxnkUfqzIRtPr0+wcxxXvv9Rvcw== dependencies: "@snyk/cli-interface" "2.3.0" "@types/debug" "^4.1.4" @@ -13792,12 +13799,12 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.294.1: - version "1.294.1" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.294.1.tgz#c0dc6d6a764bf5a8307a53dc95660e82c7d4ba65" - integrity sha512-7W5Rd2TYm96ju+1WTuYXv6YWahj9aSHMxBOxvi5CmEazvLBTTTVpY6RdvHkR7Nluna3qf/3zyAQuVciCrQLhwg== +snyk@^1.297.1: + version "1.297.1" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.297.1.tgz#06b5e5892bb280088fde5b7ca1b298845b9387bb" + integrity sha512-o+BfGFrgEdko8TWbZUPc6LZXB6Ma0frL7A82uz0SoE5/dMHYNj8ko9cJ8AUf3kDZ9JoMuuQDVn4UPHAfffUkNA== dependencies: - "@snyk/cli-interface" "2.3.0" + "@snyk/cli-interface" "2.3.2" "@snyk/configstore" "^3.2.0-rc1" "@snyk/dep-graph" "1.13.1" "@snyk/gemfile" "1.2.0" @@ -13822,9 +13829,9 @@ snyk@^1.294.1: proxy-from-env "^1.0.0" semver "^6.0.0" snyk-config "^2.2.1" - snyk-docker-plugin "1.38.0" + snyk-docker-plugin "2.2.0" snyk-go-plugin "1.13.0" - snyk-gradle-plugin "3.2.4" + snyk-gradle-plugin "3.2.5" snyk-module "1.9.1" snyk-mvn-plugin "2.9.0" snyk-nodejs-lockfile-parser "1.17.0" @@ -14902,10 +14909,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.7.2: - version "3.7.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" - integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== +typescript@^3.8.2: + version "3.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a" + integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ== ua-parser-js@^0.7.18: version "0.7.21" diff --git a/server/package.json b/server/package.json index 0c0e8ef9..08c0a2e8 100644 --- a/server/package.json +++ b/server/package.json @@ -21,11 +21,11 @@ "dependencies": { "@types/graphql-depth-limit": "^1.1.2", "@types/graphql-iso-date": "^3.3.3", - "@types/node-fetch": "^2.5.3", + "@types/node-fetch": "^2.5.5", "@types/underscore": "^1.9.4", "apollo-server": "^2.10.1", "base64url": "^3.0.1", - "date-fns": "^2.8.1", + "date-fns": "^2.10.0", "dotenv": "^8.2.0", "graphql": "^14.6.0", "graphql-depth-limit": "^1.1.0", @@ -42,7 +42,7 @@ "prettier": "^1.18.2", "pretty-quick": "^2.0.0", "ts-loader": "^6.2.1", - "typescript": "^3.7.5", + "typescript": "^3.8.2", "webpack": "^4.41.6", "webpack-cli": "^3.3.11", "webpack-merge": "^4.2.2", diff --git a/server/yarn.lock b/server/yarn.lock index ddc94076..65b8ea38 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -311,13 +311,21 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node-fetch@2.5.4", "@types/node-fetch@^2.5.3": +"@types/node-fetch@2.5.4": version "2.5.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.4.tgz#5245b6d8841fc3a6208b82291119bc11c4e0ce44" integrity sha512-Oz6id++2qAOFuOlE1j0ouk1dzl3mmI1+qINPNBhi9nt/gVOz0G+13Ao6qjhdF0Ys+eOkhu6JnFmt38bR3H0POQ== dependencies: "@types/node" "*" +"@types/node-fetch@^2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.5.tgz#cd264e20a81f4600a6c52864d38e7fef72485e92" + integrity sha512-IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*": version "13.5.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.0.tgz#4e498dbf355795a611a87ae5ef811a8660d42662" @@ -1835,10 +1843,10 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-fns@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.9.0.tgz#d0b175a5c37ed5f17b97e2272bbc1fa5aec677d2" - integrity sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA== +date-fns@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.10.0.tgz#abd10604d8bafb0bcbd2ba2e9b0563b922ae4b6b" + integrity sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA== debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" @@ -2427,7 +2435,7 @@ forever-agent@0.6.1, forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@3.0.0: +form-data@3.0.0, form-data@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg== @@ -5397,10 +5405,10 @@ typeforce@^1.11.3, typeforce@^1.11.5: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== -typescript@^3.7.5: - version "3.7.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" - integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== +typescript@^3.8.2: + version "3.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a" + integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ== underscore@^1.9.1: version "1.9.2"