From f8f6f4121fd541a55fb005dbca7fe14680f9a003 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 16:15:43 +0000 Subject: [PATCH] Update react-router --- apps/govuk-docs/package.json | 4 +- apps/govuk-template/package.json | 4 +- lib/app-composer/package.json | 4 +- lib/component-test-helpers/package.json | 2 +- lib/forms/package.json | 2 +- lib/route-utils/package.json | 4 +- package.json | 4 +- packages/components/package.json | 4 +- pnpm-lock.yaml | 105 +++++++++--------------- 9 files changed, 54 insertions(+), 79 deletions(-) diff --git a/apps/govuk-docs/package.json b/apps/govuk-docs/package.json index 53239ca0f..a78276d18 100644 --- a/apps/govuk-docs/package.json +++ b/apps/govuk-docs/package.json @@ -57,8 +57,8 @@ "react": "16.14.0", "react-dom": "16.14.0", "react-helmet-async": "1.3.0", - "react-router": "5.3.4", - "react-router-dom": "5.3.4", + "react-router": "6.11.2", + "react-router-dom": "6.11.2", "serverless": "3.30.1", "start-server-and-test": "2.0.0", "ts-jest": "29.1.0", diff --git a/apps/govuk-template/package.json b/apps/govuk-template/package.json index 56450505c..2b9639a06 100644 --- a/apps/govuk-template/package.json +++ b/apps/govuk-template/package.json @@ -61,8 +61,8 @@ "react": "16.14.0", "react-dom": "16.14.0", "react-helmet-async": "1.3.0", - "react-router": "5.3.4", - "react-router-dom": "5.3.4", + "react-router": "6.11.2", + "react-router-dom": "6.11.2", "serverless": "3.30.1", "start-server-and-test": "2.0.0", "ts-jest": "29.1.0", diff --git a/lib/app-composer/package.json b/lib/app-composer/package.json index f508e055e..44c16d0b7 100644 --- a/lib/app-composer/package.json +++ b/lib/app-composer/package.json @@ -26,8 +26,8 @@ "@not-govuk/user-info": "^0.7.2", "react": "^16.9.35", "react-helmet-async": "^1.0.7", - "react-router": "^5.1.7", - "react-router-dom": "^5.1.5" + "react-router": "^5.1.7 || ^6.0.0", + "react-router-dom": "^5.1.5 || ^6.0.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/component-test-helpers/package.json b/lib/component-test-helpers/package.json index d197c5fa0..c45cf6eb9 100644 --- a/lib/component-test-helpers/package.json +++ b/lib/component-test-helpers/package.json @@ -20,7 +20,7 @@ "license": "MIT", "peerDependencies": { "react": "^16.9.35", - "react-router": "^5.1.7" + "react-router": "^5.1.7 || ^6.0.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/forms/package.json b/lib/forms/package.json index 1d8b13af8..68d0fc9e8 100644 --- a/lib/forms/package.json +++ b/lib/forms/package.json @@ -31,7 +31,7 @@ "peerDependencies": { "react": "^16.9.35", "react-dom": "^16.9.8", - "react-router-dom": "^5.1.5" + "react-router-dom": "^5.1.5 || ^6.0.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/route-utils/package.json b/lib/route-utils/package.json index e25a44222..cce472627 100644 --- a/lib/route-utils/package.json +++ b/lib/route-utils/package.json @@ -22,12 +22,12 @@ "node": ">=12.0.0" }, "dependencies": { - "history": "4.10.1", + "history": "5.3.0", "qs": "^6.11.0", "url-parse": "^1.5.10" }, "peerDependencies": { - "react-router-dom": "^5.1.5" + "react-router-dom": "^5.1.5 || ^6.0.0" }, "devDependencies": { "@types/history": "4.7.11", diff --git a/package.json b/package.json index 0daaec8c4..31c5e0c3e 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ "react": "16.14.0", "react-dom": "16.14.0", "react-helmet-async": "1.3.0", - "react-router": "5.3.4", - "react-router-dom": "5.3.4", + "react-router": "6.11.2", + "react-router-dom": "6.11.2", "ts-jest": "29.1.0", "typescript": "4.9.5", "webpack": "5.80.0", diff --git a/packages/components/package.json b/packages/components/package.json index e0856ae7b..c68542ada 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -78,8 +78,8 @@ "peerDependencies": { "react": "^16.9.35", "react-dom": "^16.9.8", - "react-router": "^5.1.7", - "react-router-dom": "^5.1.5" + "react-router": "^5.1.7 || ^6.0.0", + "react-router-dom": "^5.1.5 || ^6.0.0" }, "devDependencies": { "@not-govuk/component-test-helpers": "workspace:^0.7.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6e5e8748..09228857c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,8 +38,8 @@ importers: react: 16.14.0 react-dom: 16.14.0 react-helmet-async: 1.3.0 - react-router: 5.3.4 - react-router-dom: 5.3.4 + react-router: 6.11.2 + react-router-dom: 6.11.2 ts-jest: 29.1.0 typescript: 4.9.5 webpack: 5.80.0 @@ -81,8 +81,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_react-dom@16.14.0+react@16.14.0 - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.11.2_react@16.14.0 + react-router-dom: 6.11.2_react-dom@16.14.0+react@16.14.0 ts-jest: 29.1.0_532d7347c3e9502c9be7a4c31792ffb3 typescript: 4.9.5 webpack: 5.80.0_webpack-cli@5.0.2 @@ -116,8 +116,8 @@ importers: react: 16.14.0 react-dom: 16.14.0 react-helmet-async: 1.3.0 - react-router: 5.3.4 - react-router-dom: 5.3.4 + react-router: 6.11.2 + react-router-dom: 6.11.2 serverless: 3.30.1 start-server-and-test: 2.0.0 ts-jest: 29.1.0 @@ -151,8 +151,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_react-dom@16.14.0+react@16.14.0 - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.11.2_react@16.14.0 + react-router-dom: 6.11.2_react-dom@16.14.0+react@16.14.0 serverless: 3.30.1 start-server-and-test: 2.0.0 ts-jest: 29.1.0_532d7347c3e9502c9be7a4c31792ffb3 @@ -192,8 +192,8 @@ importers: react: 16.14.0 react-dom: 16.14.0 react-helmet-async: 1.3.0 - react-router: 5.3.4 - react-router-dom: 5.3.4 + react-router: 6.11.2 + react-router-dom: 6.11.2 serverless: 3.30.1 start-server-and-test: 2.0.0 ts-jest: 29.1.0 @@ -231,8 +231,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_react-dom@16.14.0+react@16.14.0 - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.11.2_react@16.14.0 + react-router-dom: 6.11.2_react-dom@16.14.0+react@16.14.0 serverless: 3.30.1 start-server-and-test: 2.0.0 ts-jest: 29.1.0_532d7347c3e9502c9be7a4c31792ffb3 @@ -259,7 +259,7 @@ importers: dependencies: '@not-govuk/component-helpers': link:../../lib/component-helpers '@not-govuk/route-utils': link:../../lib/route-utils - react-router-hash-link: 2.4.3_4b858a23c9b508019e053f75d81978cc + react-router-hash-link: 2.4.3_7c1590b4375cbb155ef709e8de94d4da devDependencies: '@mdx-js/react': 1.6.22_react@16.14.0 '@not-govuk/component-test-helpers': link:../../lib/component-test-helpers @@ -1891,7 +1891,7 @@ importers: '@types/history': 4.7.11 '@types/react-router': 5.1.20 '@types/url-parse': 1.4.8 - history: 4.10.1 + history: 5.3.0 jest: 29.5.0 jest-environment-jsdom: 29.5.0 qs: ^6.11.0 @@ -1899,7 +1899,7 @@ importers: typescript: 4.9.5 url-parse: ^1.5.10 dependencies: - history: 4.10.1 + history: 5.3.0 qs: 6.11.0 url-parse: 1.5.10 devDependencies: @@ -5861,6 +5861,10 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: false + /@remix-run/router/1.6.2: + resolution: {integrity: sha512-LzqpSrMK/3JBAVBI9u3NWtOhWNw5AMQfrUFYB0+bDHTSw17z++WJLsPsxAuK+oSddsxk4d7F/JcdDPM1M5YAhA==} + engines: {node: '>=14'} + /@serverless/dashboard-plugin/6.2.3_supports-color@8.1.1: resolution: {integrity: sha512-iTZhpZbiVl6G2AyfgoqxemqqpG4pUceWys3GsyZtjimnfnGd2UFBOMVUMTavLhYia7lQc4kQVuXQ+afLlkg+pQ==} engines: {node: '>=12.0'} @@ -7608,7 +7612,7 @@ packages: /@types/express-serve-static-core/4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 18.16.10 + '@types/node': 18.16.13 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -7913,7 +7917,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 18.16.10 + '@types/node': 18.16.13 dev: true /@types/serve-static/1.15.1: @@ -13132,15 +13136,11 @@ packages: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} dev: true - /history/4.10.1: - resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==} + /history/5.3.0: + resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: '@babel/runtime': 7.21.0 - loose-envify: 1.4.0 - resolve-pathname: 3.0.0 - tiny-invariant: 1.3.1 - tiny-warning: 1.0.3 - value-equal: 1.0.1 + dev: false /hmac-drbg/1.0.1: resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} @@ -13982,9 +13982,6 @@ packages: resolution: {integrity: sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==} dev: true - /isarray/0.0.1: - resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} - /isarray/1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -16534,11 +16531,6 @@ packages: /path-to-regexp/0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} - /path-to-regexp/1.8.0: - resolution: {integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==} - dependencies: - isarray: 0.0.1 - /path-type/1.1.0: resolution: {integrity: sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==} engines: {node: '>=0.10.0'} @@ -17263,21 +17255,19 @@ packages: resolution: {integrity: sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==} engines: {node: '>=0.10.0'} - /react-router-dom/5.3.4_react@16.14.0: - resolution: {integrity: sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==} + /react-router-dom/6.11.2_react-dom@16.14.0+react@16.14.0: + resolution: {integrity: sha512-JNbKtAeh1VSJQnH6RvBDNhxNwemRj7KxCzc5jb7zvDSKRnPWIFj9pO+eXqjM69gQJ0r46hSz1x4l9y0651DKWw==} + engines: {node: '>=14'} peerDependencies: - react: '>=15' + react: '>=16.8' + react-dom: '>=16.8' dependencies: - '@babel/runtime': 7.21.0 - history: 4.10.1 - loose-envify: 1.4.0 - prop-types: 15.8.1 + '@remix-run/router': 1.6.2 react: 16.14.0 - react-router: 5.3.4_react@16.14.0 - tiny-invariant: 1.3.1 - tiny-warning: 1.0.3 + react-dom: 16.14.0_react@16.14.0 + react-router: 6.11.2_react@16.14.0 - /react-router-hash-link/2.4.3_4b858a23c9b508019e053f75d81978cc: + /react-router-hash-link/2.4.3_7c1590b4375cbb155ef709e8de94d4da: resolution: {integrity: sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==} peerDependencies: react: '>=15' @@ -17285,24 +17275,17 @@ packages: dependencies: prop-types: 15.8.1 react: 16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router-dom: 6.11.2_react-dom@16.14.0+react@16.14.0 dev: false - /react-router/5.3.4_react@16.14.0: - resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==} + /react-router/6.11.2_react@16.14.0: + resolution: {integrity: sha512-74z9xUSaSX07t3LM+pS6Un0T55ibUE/79CzfZpy5wsPDZaea1F8QkrsiyRnA2YQ7LwE/umaydzXZV80iDCPkMg==} + engines: {node: '>=14'} peerDependencies: - react: '>=15' + react: '>=16.8' dependencies: - '@babel/runtime': 7.21.0 - history: 4.10.1 - hoist-non-react-statics: 3.3.2 - loose-envify: 1.4.0 - path-to-regexp: 1.8.0 - prop-types: 15.8.1 + '@remix-run/router': 1.6.2 react: 16.14.0 - react-is: 16.13.1 - tiny-invariant: 1.3.1 - tiny-warning: 1.0.3 /react-sizeme/3.0.2: resolution: {integrity: sha512-xOIAOqqSSmKlKFJLO3inBQBdymzDuXx4iuwkNcJmC96jeiOg5ojByvL+g3MW9LPEsojLbC6pf68zOfobK8IPlw==} @@ -17668,9 +17651,6 @@ packages: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} - /resolve-pathname/3.0.0: - resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==} - /resolve-url-loader/5.0.0: resolution: {integrity: sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==} engines: {node: '>=12'} @@ -19145,11 +19125,9 @@ packages: next-tick: 1.1.0 dev: true - /tiny-invariant/1.3.1: - resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==} - /tiny-warning/1.0.3: resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} + dev: false /title-case/3.0.3: resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==} @@ -19802,9 +19780,6 @@ packages: engines: {node: '>= 0.10'} dev: false - /value-equal/1.0.1: - resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==} - /value-or-promise/1.0.12: resolution: {integrity: sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==} engines: {node: '>=12'}