From 5622335a0966a44e2561165164ea1e222c73b2d8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 20:57:21 +0000 Subject: [PATCH 1/9] Bump redux-saga-test-plan from 4.0.0-beta.3 to 4.0.0-rc.3 Bumps [redux-saga-test-plan](https://github.com/jfairbank/redux-saga-test-plan) from 4.0.0-beta.3 to 4.0.0-rc.3. - [Release notes](https://github.com/jfairbank/redux-saga-test-plan/releases) - [Changelog](https://github.com/jfairbank/redux-saga-test-plan/blob/master/CHANGELOG.md) - [Commits](https://github.com/jfairbank/redux-saga-test-plan/compare/v4.0.0-beta.3...v4.0.0-rc.3) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2896de3..821fccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27471,9 +27471,9 @@ } }, "redux-saga-test-plan": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/redux-saga-test-plan/-/redux-saga-test-plan-4.0.0-beta.3.tgz", - "integrity": "sha512-nOA2MsUHlp5JGlGhDo8IbVnKXIh1qLCE4vZE5rz1wvdXLMEk6F9QwfI1LbdaBT0XdrxjeI+JjeUAMZ5sgYfeTA==", + "version": "4.0.0-rc.3", + "resolved": "https://registry.npmjs.org/redux-saga-test-plan/-/redux-saga-test-plan-4.0.0-rc.3.tgz", + "integrity": "sha512-18Ha1AWmP4Xt64cSyJv2j7sH8lwQzdk/LByiyhoNyuqyhzkQzlKlflHr3LqiSCzn3e2AgFxagynto8XGRqsHcg==", "dev": true, "requires": { "core-js": "^2.4.1", @@ -27485,9 +27485,9 @@ }, "dependencies": { "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==", + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz", + "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==", "dev": true } } diff --git a/package.json b/package.json index 7b647f6..fd9ee0c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "prettier": "^1.18.2", "react-scripts": "^3.2.0", "react-test-renderer": "^16.9.0", - "redux-saga-test-plan": "^4.0.0-beta.3", + "redux-saga-test-plan": "^4.0.0-rc.3", "iso-639-1": "^2.0.5", "typescript": "^3.6.3" }, From 70483007dd71665364a91c85c07cbf1b753bdc45 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 09:27:20 +0000 Subject: [PATCH 2/9] Bump @types/react-router-dom from 4.3.4 to 5.1.2 Bumps [@types/react-router-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-router-dom) from 4.3.4 to 5.1.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-router-dom) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 821fccd..5b8b8f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5833,9 +5833,9 @@ "dev": true }, "@types/history": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.2.tgz", - "integrity": "sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.3.tgz", + "integrity": "sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==", "dev": true }, "@types/hoist-non-react-statics": { @@ -5996,9 +5996,9 @@ } }, "@types/react-router": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.0.2.tgz", - "integrity": "sha512-sdMN284GEOcqDEMS/hE/XD06Abw2fws30+xkZf3C9cSRcWopiv/HDTmunYI7DKLYKVRaWFkq1lkuJ6qeYu0E7A==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.3.tgz", + "integrity": "sha512-0gGhmerBqN8CzlnDmSgGNun3tuZFXerUclWkqEhozdLaJtfcJRUTGkKaEKk+/MpHd1KDS1+o2zb/3PkBUiv2qQ==", "dev": true, "requires": { "@types/history": "*", @@ -6006,9 +6006,9 @@ } }, "@types/react-router-dom": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.4.tgz", - "integrity": "sha512-xrwaWHpnxKk/TTRe7pmoGy3E4SyF/ojFqNfFJacw7OLdfLXRvGfk4r/XePVaZNVfeJzL8fcnNilPN7xOdJ/vGw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.2.tgz", + "integrity": "sha512-kRx8hoBflE4Dp7uus+j/0uMHR5uGTAvQtc4A3vOTWKS+epe0leCuxEx7HNT7XGUd1lH53/moWM51MV2YUyhzAg==", "dev": true, "requires": { "@types/history": "*", diff --git a/package.json b/package.json index fd9ee0c..329acbb 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/react-bootstrap-typeahead": "^3.4.5", "@types/react-dom": "^16.8.5", "@types/react-redux": "^7.1.1", - "@types/react-router-dom": "^4.3.4", + "@types/react-router-dom": "^5.1.2", "@types/react-table": "^6.8.5", "@types/reactstrap": "^8.0.1", "@types/sha.js": "^2.4.0", From a0112f0ce5b0909a71662757a11a7220f9062fdb Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 16 Nov 2019 20:21:36 +0000 Subject: [PATCH 3/9] after running npm fix audit Signed-off-by: Adam Warner --- package-lock.json | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b8b8f7..9711174 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28701,9 +28701,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -30252,38 +30252,15 @@ "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { From 9d9b5af49ffadb30efec6cead901dd4fc51ebd8b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 20:28:31 +0000 Subject: [PATCH 4/9] Bump @types/chart.js from 2.7.56 to 2.9.0 Bumps [@types/chart.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chart.js) from 2.7.56 to 2.9.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chart.js) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9711174..f015ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5777,9 +5777,9 @@ } }, "@types/chart.js": { - "version": "2.7.56", - "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.7.56.tgz", - "integrity": "sha512-toWLqetzDO32PtrDCRKCsMmOYgHzOQUbWh3h7dGuupDpxoyx+o33lZkBBXFV0FoOUuMMEHluZBjw9Xye9ubYvg==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.0.tgz", + "integrity": "sha512-AsojgiTzlfLmIAyzzN5KkNrlkg645bg6MRBjkFsPuFYff0toasck6Jx/W772kyrSPcO90bBGtExM8wrBn/niJA==", "dev": true }, "@types/cheerio": { diff --git a/package.json b/package.json index 329acbb..17ce8e5 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": ".", "devDependencies": { - "@types/chart.js": "^2.7.56", + "@types/chart.js": "^2.9.0", "@types/enzyme": "^3.10.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/fetch-mock": "^7.3.1", From 2908c9edf0e9ca4bb53884d7cc5e79dcc6b50098 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 16 Nov 2019 21:10:39 +0000 Subject: [PATCH 5/9] test for existence of REACT_APP_CUSTOM_API_URL, use that if it exists, else fallback to PUBLIC_URL Signed-off-by: Adam Warner --- src/config.development.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/config.development.tsx b/src/config.development.tsx index d9e4d4f..cfb2df9 100644 --- a/src/config.development.tsx +++ b/src/config.development.tsx @@ -10,8 +10,17 @@ import { Config } from "./config"; +let apiUrlBase; + +if (process.env.REACT_APP_CUSTOM_API_URL) { + apiUrlBase = process.env.REACT_APP_CUSTOM_API_URL; +} +else { + apiUrlBase = process.env.PUBLIC_URL; +} + export default { developmentMode: true, fakeAPI: false, - apiPath: process.env.PUBLIC_URL + "/api" + apiPath: apiUrlBase + "/api" } as Config; From c644bb9c1bb910151cd5667cd3348eb7500ad163 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 16 Nov 2019 21:29:59 +0000 Subject: [PATCH 6/9] format to prettier's liking. Signed-off-by: Adam Warner --- src/config.development.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/config.development.tsx b/src/config.development.tsx index cfb2df9..2bedaad 100644 --- a/src/config.development.tsx +++ b/src/config.development.tsx @@ -14,8 +14,7 @@ let apiUrlBase; if (process.env.REACT_APP_CUSTOM_API_URL) { apiUrlBase = process.env.REACT_APP_CUSTOM_API_URL; -} -else { +} else { apiUrlBase = process.env.PUBLIC_URL; } From 045014ba6f55eb04ba7da65ea2328e8d7aaa3802 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 16 Nov 2019 21:43:20 +0000 Subject: [PATCH 7/9] apply @mcat12's suggestion. I agree, it is cleaner to read! Signed-off-by: Adam Warner --- src/config.development.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/config.development.tsx b/src/config.development.tsx index 2bedaad..61b835e 100644 --- a/src/config.development.tsx +++ b/src/config.development.tsx @@ -10,13 +10,8 @@ import { Config } from "./config"; -let apiUrlBase; - -if (process.env.REACT_APP_CUSTOM_API_URL) { - apiUrlBase = process.env.REACT_APP_CUSTOM_API_URL; -} else { - apiUrlBase = process.env.PUBLIC_URL; -} +const apiUrlBase = + process.env.REACT_APP_CUSTOM_API_URL || process.env.PUBLIC_URL; export default { developmentMode: true, From dfbb4f0af9893ad9c998a208953e935207f7b3d4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2019 09:46:56 +0000 Subject: [PATCH 8/9] Bump @types/react-dom from 16.8.5 to 16.9.4 Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 16.8.5 to 16.9.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f015ee5..1ed8307 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5975,9 +5975,9 @@ } }, "@types/react-dom": { - "version": "16.8.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.5.tgz", - "integrity": "sha512-idCEjROZ2cqh29+trmTmZhsBAUNQuYrF92JHKzZ5+aiFM1mlSk3bb23CK7HhYuOY75Apgap5y2jTyHzaM2AJGA==", + "version": "16.9.4", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.4.tgz", + "integrity": "sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==", "dev": true, "requires": { "@types/react": "*" diff --git a/package.json b/package.json index 17ce8e5..6ec7577 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@types/react": "^16.8.24", "@types/react-bootstrap-daterangepicker": "0.0.26", "@types/react-bootstrap-typeahead": "^3.4.5", - "@types/react-dom": "^16.8.5", + "@types/react-dom": "^16.9.4", "@types/react-redux": "^7.1.1", "@types/react-router-dom": "^5.1.2", "@types/react-table": "^6.8.5", From 7e0a8764e6c7034f34a6d1e9f1cd1da7caa5a9bb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2019 12:24:20 +0000 Subject: [PATCH 9/9] Bump @types/jest from 24.0.17 to 24.0.23 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.17 to 24.0.23. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 14 ++++---------- package.json | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ed8307..415c533 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5874,20 +5874,14 @@ } }, "@types/jest": { - "version": "24.0.17", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.17.tgz", - "integrity": "sha512-1cy3xkOAfSYn78dsBWy4M3h/QF/HeWPchNFDjysVtp3GHeTdSmtluNnELfCmfNRRHo0OWEcpf+NsEJQvwQfdqQ==", + "version": "24.0.23", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.23.tgz", + "integrity": "sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg==", "dev": true, "requires": { - "@types/jest-diff": "*" + "jest-diff": "^24.3.0" } }, - "@types/jest-diff": { - "version": "20.0.1", - "resolved": "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz", - "integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==", - "dev": true - }, "@types/jquery": { "version": "3.3.29", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz", diff --git a/package.json b/package.json index 6ec7577..c6fcdbe 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@types/enzyme": "^3.10.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/fetch-mock": "^7.3.1", - "@types/jest": "^24.0.17", + "@types/jest": "^24.0.23", "@types/lodash.debounce": "^4.0.6", "@types/lodash.isequal": "^4.5.5", "@types/node": "^12.12.7",