From dd0d8b8b85f0fed1d55f64548d20bd3fe3729034 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 02:04:33 +0000 Subject: [PATCH 01/16] Bump i18next-browser-languagedetector from 2.2.4 to 3.0.1 Bumps [i18next-browser-languagedetector](https://github.com/i18next/i18next-browser-languageDetector) from 2.2.4 to 3.0.1. - [Release notes](https://github.com/i18next/i18next-browser-languageDetector/releases) - [Changelog](https://github.com/i18next/i18next-browser-languageDetector/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next-browser-languageDetector/compare/v2.2.4...v3.0.1) --- 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 6aaa796..37e1147 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10691,9 +10691,9 @@ } }, "i18next-browser-languagedetector": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.4.tgz", - "integrity": "sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-3.0.1.tgz", + "integrity": "sha512-WFjPLNPWl62uu07AHY2g+KsC9qz0tyMq+OZEB/H7N58YKL/JLiCz9U709gaR20Mule/Ppn+uyfVx5REJJjn1HA==" }, "i18next-xhr-backend": { "version": "3.0.0", diff --git a/package.json b/package.json index 6066294..317a078 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bootstrap-daterangepicker": "^3.0.5", "chart.js": "^2.8.0", "i18next": "^16.0.0", - "i18next-browser-languagedetector": "^2.2.4", + "i18next-browser-languagedetector": "^3.0.1", "i18next-xhr-backend": "^3.0.0", "ionicons": "^4.5.8", "lodash.debounce": "^4.0.8", From 608616031887c7d74d22a526b677f03b1ad386cd Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 3 Jun 2019 19:46:36 -0700 Subject: [PATCH 02/16] Remove @types/i18next-browser-languagedetector The main package now bundles the types. Signed-off-by: Mcat12 --- package-lock.json | 6 ------ package.json | 1 - 2 files changed, 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 37e1147..4aaaf6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2584,12 +2584,6 @@ "integrity": "sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==", "dev": true }, - "@types/i18next-browser-languagedetector": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.0.1.tgz", - "integrity": "sha512-9TwP0tw0PSXUtBtM12PFUjBsl9sP5bNHd54qdSXBrrZ4HJmtVdqbKvmXLH4Qd3KQzIS2g/Z7HhLhygL2LUSb8w==", - "dev": true - }, "@types/istanbul-lib-coverage": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", diff --git a/package.json b/package.json index 317a078..4e8c6a9 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "@types/enzyme": "^3.9.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/fetch-mock": "^7.3.0", - "@types/i18next-browser-languagedetector": "^2.0.1", "@types/jest": "^24.0.13", "@types/lodash.debounce": "^4.0.6", "@types/node": "^12.0.4", From 12b98dcb91a2edb872a7164b222251166f87c1ec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 11:03:00 +0000 Subject: [PATCH 03/16] Bump i18next from 16.0.0 to 17.0.1 Bumps [i18next](https://github.com/i18next/i18next) from 16.0.0 to 17.0.1. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v16.0.0...v17.0.1) --- 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 4aaaf6d..32ec1b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10662,9 +10662,9 @@ "dev": true }, "i18next": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-16.0.0.tgz", - "integrity": "sha512-2kR0Bh1j0PxFQXNxgLjGdC1REPnwEK9bgmYsRR9w+kD4hQ5V40kwxKWNoC8RKpvHL45XoavBfOjWd470aFlWOQ==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.0.1.tgz", + "integrity": "sha512-pg+RxJWoqEt4JtueOkoxXshivtmsf8u0SuTYQTSB5cUTNWUyw/Py3zF//A/vd5FEUaiooyPCNNJ94leQ8J4JEQ==", "requires": { "@babel/runtime": "^7.3.1" }, diff --git a/package.json b/package.json index 4e8c6a9..158dd19 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "bootstrap": "^4.3.1", "bootstrap-daterangepicker": "^3.0.5", "chart.js": "^2.8.0", - "i18next": "^16.0.0", + "i18next": "^17.0.1", "i18next-browser-languagedetector": "^3.0.1", "i18next-xhr-backend": "^3.0.0", "ionicons": "^4.5.8", From a4472791b71123e19bbc508db68b4996fc0496e7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 03:16:13 +0000 Subject: [PATCH 04/16] Bump react-bootstrap-typeahead from 3.4.4 to 3.4.5 Bumps [react-bootstrap-typeahead](https://github.com/ericgio/react-bootstrap-typeahead) from 3.4.4 to 3.4.5. - [Release notes](https://github.com/ericgio/react-bootstrap-typeahead/releases) - [Changelog](https://github.com/ericgio/react-bootstrap-typeahead/blob/master/CHANGELOG.md) - [Commits](https://github.com/ericgio/react-bootstrap-typeahead/compare/v3.4.4...v3.4.5) --- 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 32ec1b2..c0b762a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18486,9 +18486,9 @@ "integrity": "sha512-BZwwRaWcUDZVVgzQBtbmnbV1jyNNlfI5v7Jxb9FNEJ9FW8m+hzJgDFUMUlvz3VKCe5JNKcv5fKBizIDFSIUu+A==" }, "react-bootstrap-typeahead": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/react-bootstrap-typeahead/-/react-bootstrap-typeahead-3.4.4.tgz", - "integrity": "sha512-9v9l3a+GzwpFgBBwl9Rnvg/65LLyStsPuaFOan+XLrsS9pBOp+ukBwEHhgdkwblsT1snur06R8TB1aUtY7f8lg==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/react-bootstrap-typeahead/-/react-bootstrap-typeahead-3.4.5.tgz", + "integrity": "sha512-accbqAcc7YLEiFSr+XfWfk0LamPZ8oU8VgYNcMpxk0Dt1JtctsuMoRQXRDs2JMS5W+g4r5zdx+qyYZ/bPCODoA==", "requires": { "classnames": "^2.2.0", "create-react-context": "^0.2.3", @@ -18808,9 +18808,9 @@ } }, "react-is": { - "version": "16.4.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.1.tgz", - "integrity": "sha512-xpb0PpALlFWNw/q13A+1aHeyJyLYCg0/cCHPUA43zYluZuIPHaHL3k8OBsTgQtxqW0FhyDEMvi8fZ/+7+r4OSQ==" + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" }, "react-lifecycles-compat": { "version": "3.0.4", diff --git a/package.json b/package.json index 158dd19..33d999a 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "prop-types": "^15.7.2", "react": "^16.8.6", "react-bootstrap-daterangepicker": "^4.1.0", - "react-bootstrap-typeahead": "^3.4.4", + "react-bootstrap-typeahead": "^3.4.5", "react-chartjs-2": "^2.7.6", "react-dom": "^16.8.6", "react-i18next": "^10.11.0", From 25e4444eb593d8796f866296ce6230bbcc290423 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 03:24:05 +0000 Subject: [PATCH 05/16] Bump enzyme from 3.9.0 to 3.10.0 Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/airbnb/enzyme/releases) - [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/enzyme/commits/enzyme@3.10.0/packages/enzyme) --- 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 c0b762a..3222103 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6883,9 +6883,9 @@ "dev": true }, "enzyme": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.9.0.tgz", - "integrity": "sha512-JqxI2BRFHbmiP7/UFqvsjxTirWoM1HfeaJrmVSZ9a1EADKkZgdPcAuISPMpoUiHlac9J4dYt81MC5BBIrbJGMg==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.10.0.tgz", + "integrity": "sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg==", "dev": true, "requires": { "array.prototype.flat": "^1.2.1", diff --git a/package.json b/package.json index 33d999a..1168d88 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@types/react-table": "^6.8.3", "@types/reactstrap": "^8.0.1", "@types/sha.js": "^2.4.0", - "enzyme": "^3.9.0", + "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.13.2", "faker": "^4.1.0", "fetch-mock": "^7.3.3", From 9782998ae02ae2511ead3b0ff72b82b1cbdc23af Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 4 Jun 2019 20:30:09 -0700 Subject: [PATCH 06/16] Replace mount usage with shallow Enzyme 3.10.0 has fixed using context in shallow, so we no longer need to use mount. Signed-off-by: Mcat12 --- .../common/__tests__/EnableDisable.test.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/common/__tests__/EnableDisable.test.tsx b/src/components/common/__tests__/EnableDisable.test.tsx index 6c6792a..73ace49 100644 --- a/src/components/common/__tests__/EnableDisable.test.tsx +++ b/src/components/common/__tests__/EnableDisable.test.tsx @@ -8,7 +8,7 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ -import { mount, shallow, ShallowWrapper } from "enzyme"; +import { shallow, ShallowWrapper } from "enzyme"; import { EnableDisable, EnableDisableContainer, @@ -37,14 +37,13 @@ describe("EnableDisableContainer", () => { refresh: jest.fn() }; - // Using mount here as there are issues with passing functions via context - // when using shallow (the passed in value is not equal to the received - // value) - const wrapper = mount( + const wrapper = shallow( - ); + ) + .dive() + .dive(); const props = wrapper.find(EnableDisable).props(); From dd3308c3e7d780780dd5c8904c4e875d77116ced Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 03:36:25 +0000 Subject: [PATCH 07/16] Bump enzyme-adapter-react-16 from 1.13.2 to 1.14.0 Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.13.2 to 1.14.0. - [Release notes](https://github.com/airbnb/enzyme/releases) - [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.14.0/packages/enzyme-adapter-react-16) --- package-lock.json | 151 +--------------------------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 149 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3222103..4325523 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3140,32 +3140,6 @@ "requires": { "function-bind": "^1.1.1" } - }, - "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==", - "dev": true, - "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==", - "dev": true, - "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==", - "dev": true } } }, @@ -6929,9 +6903,9 @@ } }, "enzyme-adapter-react-16": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.13.2.tgz", - "integrity": "sha512-h0neTuAAFfQUgEZ+PPHVIMDFJ9+CGafI8AjojNlSVh4Fd1pLDgtl2OeVkm4yKF7RSgzrPAwugq4JW8Jjo2iRJA==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz", + "integrity": "sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==", "dev": true, "requires": { "enzyme-adapter-utils": "^1.12.0", @@ -6944,40 +6918,6 @@ "semver": "^5.7.0" }, "dependencies": { - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" - } - }, - "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -6987,65 +6927,6 @@ "function-bind": "^1.1.1" } }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true - }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true, - "requires": { - "has-symbols": "^1.0.0" - } - }, - "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==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.values": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", - "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.12.0", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "dev": true, - "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==", - "dev": true - }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -7068,32 +6949,6 @@ "semver": "^5.6.0" }, "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==", - "dev": true, - "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==", - "dev": true, - "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==", - "dev": true - }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", diff --git a/package.json b/package.json index 1168d88..0b6012a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/reactstrap": "^8.0.1", "@types/sha.js": "^2.4.0", "enzyme": "^3.10.0", - "enzyme-adapter-react-16": "^1.13.2", + "enzyme-adapter-react-16": "^1.14.0", "faker": "^4.1.0", "fetch-mock": "^7.3.3", "fs-extra": "^8.0.1", From 8545f2a0f908090a8499b789ae1105d4e8a79f8a Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 4 Jun 2019 21:52:08 -0700 Subject: [PATCH 08/16] Add Codecov to CI This will upload the code coverage to codecov.io, which is integrated with the GitHub repository. Signed-off-by: Mcat12 --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83729f7..7d3a943 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,6 +50,11 @@ jobs: chmod +x ./FTL-client ./FTL-client "$FOLDER" pihole-web.tar.gz "$FTL_SECRET" rm ./FTL-client + - run: + name: "Upload Code Coverage" + command: | + npm install codecov -g + codecov - save_cache: key: v1-build-{{ checksum "package-lock.json" }} paths: From b27904eae8bf7e091a8541cb95b0e55866a26e73 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 4 Jun 2019 22:01:04 -0700 Subject: [PATCH 09/16] Generate test coverage for Codecov Signed-off-by: Mcat12 --- .circleci/config.yml | 2 +- .gitignore | 3 +++ package.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d3a943..4614432 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ version: 2 .test: &test run: name: "Test" - command: npm test + command: npm run coverage .store_version: &store_version run: diff --git a/.gitignore b/.gitignore index f46e49f..44052dd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ node_modules build src/scss/style.css +# Test Files +coverage + # Generated Files src/languages.json diff --git a/package.json b/package.json index 0b6012a..7c10c45 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "generate-language-list": "node scripts/generate-language-list.js", "make-fake-data": "node scripts/make-fake-data.js", "test": "react-scripts test --env=jsdom", + "coverage": "react-scripts test --env=jsdom --coverage", "eject": "react-scripts eject", "format": "prettier --write \"src/**/*.tsx\"", "check-format": "prettier --list-different \"src/**/*.tsx\"" From f3a8ce8ca4ce73bcd8d014f5e0a1288d2b775d45 Mon Sep 17 00:00:00 2001 From: Richard Denton Date: Wed, 5 Jun 2019 17:40:06 +0800 Subject: [PATCH 10/16] Sign off Signed-off-by: Richard Denton --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 7536bea..74ffa1e 100644 --- a/public/index.html +++ b/public/index.html @@ -40,7 +40,7 @@ - + From 535d73299b3e8dc4f002ebbf2cfe4e6489a7fa1c Mon Sep 17 00:00:00 2001 From: Richard Denton Date: Wed, 5 Jun 2019 17:51:45 +0800 Subject: [PATCH 11/16] Ensure modal content is centered on mobile Signed-off-by: Richard Denton --- src/scss/_custom.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 0c90f45..52f9744 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -219,3 +219,9 @@ body { display: none; } } + +@media (max-width: 576px) { + .modal-dialog { + margin: 0.5rem auto; + } +} From 46ea48e0748ba4dadd5c2b8b83d36c3ac2608972 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 02:25:21 +0000 Subject: [PATCH 12/16] Bump @fortawesome/fontawesome-free from 5.8.2 to 5.9.0 Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.8.2...5.9.0) 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 4325523..89319f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1300,9 +1300,9 @@ "dev": true }, "@fortawesome/fontawesome-free": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz", - "integrity": "sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg==" + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz", + "integrity": "sha512-g795BBEzM/Hq2SYNPm/NQTIp3IWd4eXSH0ds87Na2jnrAUFX3wkyZAI4Gwj9DOaWMuz2/01i8oWI7P7T/XLkhg==" }, "@hapi/address": { "version": "2.0.0", diff --git a/package.json b/package.json index 0b6012a..36d2c1a 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@coreui/coreui": "^2.1.11", "@coreui/icons": "0.3.0", "@coreui/react": "^2.5.1", - "@fortawesome/fontawesome-free": "^5.8.2", + "@fortawesome/fontawesome-free": "^5.9.0", "bootstrap": "^4.3.1", "bootstrap-daterangepicker": "^3.0.5", "chart.js": "^2.8.0", From bf278cba254ca39c84d4a90cc3d9c2e80fa2ccd2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 02:36:29 +0000 Subject: [PATCH 13/16] Bump react-router-dom from 5.0.0 to 5.0.1 Bumps [react-router-dom](https://github.com/ReactTraining/react-router) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/ReactTraining/react-router/releases) - [Commits](https://github.com/ReactTraining/react-router/compare/v5.0.0...v5.0.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 55 ++++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89319f4..002245e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9990,13 +9990,6 @@ "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", "requires": { "react-is": "^16.7.0" - }, - "dependencies": { - "react-is": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", - "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" - } } }, "hosted-git-info": { @@ -15250,6 +15243,31 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, + "mini-create-react-context": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz", + "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==", + "requires": { + "@babel/runtime": "^7.4.0", + "gud": "^1.0.0", + "tiny-warning": "^1.0.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", + "requires": { + "regenerator-runtime": "^0.13.2" + } + }, + "regenerator-runtime": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" + } + } + }, "mini-css-extract-plugin": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz", @@ -18719,39 +18737,32 @@ } }, "react-router": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz", - "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.1.tgz", + "integrity": "sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==", "requires": { "@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", + "mini-create-react-context": "^0.3.0", "path-to-regexp": "^1.7.0", "prop-types": "^15.6.2", "react-is": "^16.6.0", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" - }, - "dependencies": { - "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": "5.0.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz", - "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.1.tgz", + "integrity": "sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==", "requires": { "@babel/runtime": "^7.1.2", "history": "^4.9.0", "loose-envify": "^1.3.1", "prop-types": "^15.6.2", - "react-router": "5.0.0", + "react-router": "5.0.1", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" } diff --git a/package.json b/package.json index 36d2c1a..bad9e34 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "react-chartjs-2": "^2.7.6", "react-dom": "^16.8.6", "react-i18next": "^10.11.0", - "react-router-dom": "^5.0.0", + "react-router-dom": "^5.0.1", "react-table": "^6.10.0", "reactstrap": "^8.0.0", "sha.js": "^2.4.11", From 1d03ed631c9ea6127f18565ae2f592d77a316444 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 13:42:22 +0000 Subject: [PATCH 14/16] Bump @types/node from 12.0.4 to 12.0.5 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.4 to 12.0.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) 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 002245e..46e0fd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2649,9 +2649,9 @@ } }, "@types/node": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz", - "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==", + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.5.tgz", + "integrity": "sha512-CFLSALoE+93+Hcb5pFjp0J1uMrrbLRe+L1+gFwerJ776R3TACSF0kTVRQ7AvRa7aFx70nqYHAc7wQPlt9kY2Mg==", "dev": true }, "@types/prop-types": { diff --git a/package.json b/package.json index 3e1ebd1..52d6bf3 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@types/fetch-mock": "^7.3.0", "@types/jest": "^24.0.13", "@types/lodash.debounce": "^4.0.6", - "@types/node": "^12.0.4", + "@types/node": "^12.0.5", "@types/react": "^16.8.19", "@types/react-bootstrap-daterangepicker": "0.0.26", "@types/react-bootstrap-typeahead": "^3.4.5", From 8d9a59be3669b8a20281c4ec449c4e17cd9b7f60 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 02:48:49 +0000 Subject: [PATCH 15/16] Bump i18next from 17.0.1 to 17.0.2 Bumps [i18next](https://github.com/i18next/i18next) from 17.0.1 to 17.0.2. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v17.0.1...v17.0.2) 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 46e0fd0..4cc37d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10510,9 +10510,9 @@ "dev": true }, "i18next": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.0.1.tgz", - "integrity": "sha512-pg+RxJWoqEt4JtueOkoxXshivtmsf8u0SuTYQTSB5cUTNWUyw/Py3zF//A/vd5FEUaiooyPCNNJ94leQ8J4JEQ==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.0.2.tgz", + "integrity": "sha512-hDjPzq0R6njFCHQJufxgZw0+czFaepapVB+Bm02AEUyy/50qmnbfvho1LW2tw6HrSwOinDF1yvn1MayefjSscg==", "requires": { "@babel/runtime": "^7.3.1" }, diff --git a/package.json b/package.json index 52d6bf3..5f8f1c7 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "bootstrap": "^4.3.1", "bootstrap-daterangepicker": "^3.0.5", "chart.js": "^2.8.0", - "i18next": "^17.0.1", + "i18next": "^17.0.2", "i18next-browser-languagedetector": "^3.0.1", "i18next-xhr-backend": "^3.0.0", "ionicons": "^4.5.8", From 6758a3d721f72a175e743cb8ab1d92a6296f065c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 13:40:52 +0000 Subject: [PATCH 16/16] Bump @types/node from 12.0.5 to 12.0.7 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.5 to 12.0.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) 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 4cc37d1..58edc62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2649,9 +2649,9 @@ } }, "@types/node": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.5.tgz", - "integrity": "sha512-CFLSALoE+93+Hcb5pFjp0J1uMrrbLRe+L1+gFwerJ776R3TACSF0kTVRQ7AvRa7aFx70nqYHAc7wQPlt9kY2Mg==", + "version": "12.0.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.7.tgz", + "integrity": "sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==", "dev": true }, "@types/prop-types": { diff --git a/package.json b/package.json index 5f8f1c7..dfcab78 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@types/fetch-mock": "^7.3.0", "@types/jest": "^24.0.13", "@types/lodash.debounce": "^4.0.6", - "@types/node": "^12.0.5", + "@types/node": "^12.0.7", "@types/react": "^16.8.19", "@types/react-bootstrap-daterangepicker": "0.0.26", "@types/react-bootstrap-typeahead": "^3.4.5",