diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c4b36d23624..a2e3b026596 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -57,6 +57,12 @@ updates: - dependency-name: "@sentry/tracing" versions: - ">= 0" + - dependency-name: "@nivo/pie" + versions: + - ">= 0" + - dependency-name: "@nivo/tooltip" + versions: + - ">= 0" # ignore all GitHub linguist patch updates - dependency-name: "github-linguist" update-types: ["version-update:semver-patch"] diff --git a/docs/Dependabot.md b/docs/Dependabot.md index 260520133a2..1be4bbc7bea 100644 --- a/docs/Dependabot.md +++ b/docs/Dependabot.md @@ -40,6 +40,7 @@ The `react-dom` and `react` packages should, where possible, be kept at the same Some of the packages we use have several companion packages that should be kept at the same version in order for them to work correctly. In order to optimise the number of upgrades we perform and to prevent wastage of CircleCI resource on redundant PRs, Dependabot has been configured to only upgrade one dependency in the group with the expectation being that the others should be updated using a script. -We currently have two groups of dependencies that need to be updated in this manner: +We currently have three groups of dependencies that need to be updated in this manner: +- Nivo (`dependabot:update-nivo`) - Sentry (`dependabot:update-sentry`) - Storybook (`dependabot:update-storybook`) diff --git a/package-lock.json b/package-lock.json index 863dac44064..4fde164954a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "license": "MIT", "dependencies": { "@govuk-react/constants": "^0.10.6", - "@nivo/core": "^0.80.0", - "@nivo/pie": "^0.80.0", - "@nivo/tooltip": "^0.80.0", + "@nivo/core": "^0.84.0", + "@nivo/pie": "^0.84.0", + "@nivo/tooltip": "^0.84.0", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "^1.9.7", "@sentry/browser": "^7.91.0", @@ -4496,88 +4496,131 @@ } }, "node_modules/@nivo/arcs": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/arcs/-/arcs-0.80.0.tgz", - "integrity": "sha512-g5m/wM36Ey45J3hrVDBPMw1Z6GOgIRwgb5zTh7TFoPuhRBZEDQLmctk8XYOm0xOMVCzsm6WkU5wlSQUeBY6IHQ==", - "dependencies": { - "@nivo/colors": "0.80.0", - "@react-spring/web": "9.4.5", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/arcs/-/arcs-0.84.0.tgz", + "integrity": "sha512-6i6CQmqdk7KZnaYmg8l0jqElQM19LJ/29WlxwVtDW43iQD0AqDzXb/eIwzZSZwf8sfGP8e8vvapkESlfkmzuPw==", + "dependencies": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-shape": "^2.0.0", "d3-shape": "^1.3.5" }, "peerDependencies": { - "@nivo/core": "0.80.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/colors": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.80.0.tgz", - "integrity": "sha512-T695Zr411FU4RPo7WDINOAn8f79DPP10SFJmDdEqELE+cbzYVTpXqLGZ7JMv88ko7EOf9qxLQgcBqY69rp9tHQ==", - "dependencies": { - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.84.0.tgz", + "integrity": "sha512-wNG1uYyDP5Owc1Pdkz0zesdZCrPAywmSssNzQ2Aju7nVs7Ru7iHNBIvOAGgyXTe2gcrIO9VSasXWR+jEYyxN2Q==", + "dependencies": { + "@nivo/core": "0.84.0", + "@types/d3-color": "^2.0.0", + "@types/d3-scale": "^3.2.3", + "@types/d3-scale-chromatic": "^2.0.0", + "@types/prop-types": "^15.7.2", + "d3-color": "^3.1.0", "d3-scale": "^3.2.3", "d3-scale-chromatic": "^2.0.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "prop-types": "^15.7.2" }, "peerDependencies": { - "@nivo/core": "0.80.0", - "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/core": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.80.0.tgz", - "integrity": "sha512-6caih0RavXdWWSfde+rC2pk17WrX9YQlqK26BrxIdXzv3Ydzlh5SkrC7dR2TEvMGBhunzVeLOfiC2DWT1S8CFg==", - "dependencies": { - "@nivo/recompose": "0.80.0", - "@react-spring/web": "9.4.5", - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.84.0.tgz", + "integrity": "sha512-HyQM4x4B7d4X9+xLPKkPxqIxhSDzbJUywGTDWHWx1daeX9VP8O+MqkTBsNsoB+tjxrbKrRJ0+ceS2w89JB+qrA==", + "dependencies": { + "@nivo/recompose": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-shape": "^2.0.0", + "d3-color": "^3.1.0", "d3-format": "^1.4.4", - "d3-interpolate": "^2.0.1", + "d3-interpolate": "^3.0.1", "d3-scale": "^3.2.3", - "d3-scale-chromatic": "^2.0.0", + "d3-scale-chromatic": "^3.0.0", "d3-shape": "^1.3.5", "d3-time-format": "^3.0.0", "lodash": "^4.17.21" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nivo/donate" + }, "peerDependencies": { - "@nivo/tooltip": "0.80.0", "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, + "node_modules/@nivo/core/node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dependencies": { + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@nivo/core/node_modules/d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "dependencies": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/@nivo/legends": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.80.0.tgz", - "integrity": "sha512-h0IUIPGygpbKIZZZWIxkkxOw4SO0rqPrqDrykjaoQz4CvL4HtLIUS3YRA4akKOVNZfS5agmImjzvIe0s3RvqlQ==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.84.0.tgz", + "integrity": "sha512-o0s1cXoIH6Km9A2zoKB8Ey99Oc1w5nymz0j8s7hR2B0EHo5HgVbYjSs2sZD7NSwLt3QM57Nzxw9VzJ+sqfV30Q==", + "dependencies": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@types/d3-scale": "^3.2.3", + "@types/prop-types": "^15.7.2", + "d3-scale": "^3.2.3", + "prop-types": "^15.7.2" + }, "peerDependencies": { - "@nivo/core": "0.80.0", - "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/pie": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/pie/-/pie-0.80.0.tgz", - "integrity": "sha512-Zj2PtozUg5wizxdI/2o13YzwnBwf8lLrgc8vH7ucsgOu5nj6oLLpGTuNd3CBmRJHFGIGNT39bP63lKnB3P6qOQ==", - "dependencies": { - "@nivo/arcs": "0.80.0", - "@nivo/colors": "0.80.0", - "@nivo/legends": "0.80.0", - "@nivo/tooltip": "0.80.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/pie/-/pie-0.84.0.tgz", + "integrity": "sha512-yM8oe162YlOKFZkpVhSF+9J/F3rhyUc+gS9M3M+HyVqzXM3xOKjZiqd5tckgFbvTixDK6FLsSBHzH2SRij/hDQ==", + "dependencies": { + "@nivo/arcs": "0.84.0", + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@nivo/legends": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@types/d3-shape": "^2.0.0", "d3-shape": "^1.3.5" }, "peerDependencies": { - "@nivo/core": "0.80.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/recompose": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.80.0.tgz", - "integrity": "sha512-iL3g7j3nJGD9+mRDbwNwt/IXDXH6E29mhShY1I7SP91xrfusZV9pSFf4EzyYgruNJk/2iqMuaqn+e+TVFra44A==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.84.0.tgz", + "integrity": "sha512-Odb+r0pEmGt4RV020jwvngF7PxBgxS1e1sy8bWlZKc5qkm6k3eVlZNuYU+zGbDxHMigImvrx5KfUv5iUqtQBZA==", "dependencies": { + "@types/prop-types": "^15.7.2", + "@types/react-lifecycles-compat": "^3.0.1", + "prop-types": "^15.7.2", "react-lifecycles-compat": "^3.0.4" }, "peerDependencies": { @@ -4585,14 +4628,12 @@ } }, "node_modules/@nivo/tooltip": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.80.0.tgz", - "integrity": "sha512-qGmrreRwnCsYjn/LAuwBtxBn/tvG8y+rwgd4gkANLBAoXd3bzJyvmkSe+QJPhUG64bq57ibDK+lO2pC48a3/fw==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.84.0.tgz", + "integrity": "sha512-x/6Vk4RXKHkG9q5dk4uFYwEfbMoIvJd5ahhVQ6bskuLks5FZoS6bkKoNggjxwmHbIWOVITGUXuykOfC54EWSpw==", "dependencies": { - "@react-spring/web": "9.4.5" - }, - "peerDependencies": { - "@nivo/core": "0.80.0" + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2" } }, "node_modules/@nodelib/fs.scandir": { @@ -8094,6 +8135,42 @@ "@types/node": "*" } }, + "node_modules/@types/d3-color": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.6.tgz", + "integrity": "sha512-tbaFGDmJWHqnenvk3QGSvD3RVwr631BjKRD7Sc7VLRgrdX5mk5hTyoeBL6rXZaeoXzmZwIl1D2HPogEdt1rHBg==" + }, + "node_modules/@types/d3-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz", + "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA==" + }, + "node_modules/@types/d3-scale": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz", + "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==", + "dependencies": { + "@types/d3-time": "^2" + } + }, + "node_modules/@types/d3-scale-chromatic": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.4.tgz", + "integrity": "sha512-OUgfg6wmoZVhs0/pV8HZhsMw7pYJnS6smfNK2S5ogMaPHfDUaTMu7JA5ssZrRupwf2vWI+haPAuUpsz+M1BOKA==" + }, + "node_modules/@types/d3-shape": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.7.tgz", + "integrity": "sha512-HedHlfGHdwzKqX9+PiQVXZrdmGlwo7naoefJP7kCNk4Y7qcpQt1tUaoRa6qn0kbTdlaIHGO7111qLtb/6J8uuw==", + "dependencies": { + "@types/d3-path": "^2" + } + }, + "node_modules/@types/d3-time": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz", + "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==" + }, "node_modules/@types/debug": { "version": "4.1.12", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", @@ -8400,6 +8477,14 @@ "csstype": "^3.0.2" } }, + "node_modules/@types/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-1CM48Y9ztL5S4wjt7DK2izrkgPp/Ql0zCJu/vHzhgl7J+BD4UbSGjHN1M2TlePms472JvOazUtAO1/G3oFZqIQ==", + "dependencies": { + "@types/react": "*" + } + }, "node_modules/@types/react-redux": { "version": "7.1.31", "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.31.tgz", diff --git a/package.json b/package.json index 9b9f1f46d35..3c6c090df77 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,8 @@ "adr-graph": "adr generate graph", "adr-toc": "adr generate toc", "dependabot:update-storybook": "npm install --save-dev @storybook/addon-a11y@latest @storybook/addon-essentials@latest @storybook/addons@latest @storybook/react@latest @storybook/react-webpack5@latest storybook@latest", - "dependabot:update-sentry": "npm install @sentry/browser@latest @sentry/node@latest @sentry/react@latest @sentry/tracing@latest" + "dependabot:update-sentry": "npm install @sentry/browser@latest @sentry/node@latest @sentry/react@latest @sentry/tracing@latest", + "dependabot:update-nivo": "npm install @nivo/core@latest @nivo/pie@latest @nivo/tooltip@latest" }, "nyc": { "report-dir": "cypress-coverage", @@ -67,9 +68,9 @@ }, "dependencies": { "@govuk-react/constants": "^0.10.6", - "@nivo/core": "^0.80.0", - "@nivo/pie": "^0.80.0", - "@nivo/tooltip": "^0.80.0", + "@nivo/core": "^0.84.0", + "@nivo/pie": "^0.84.0", + "@nivo/tooltip": "^0.84.0", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "^1.9.7", "@sentry/browser": "^7.91.0",