diff --git a/apps/govuk-docs/package.json b/apps/govuk-docs/package.json index 6d1b39471..431c81c85 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.22.0", + "react-router-dom": "6.22.0", "serverless": "3.34.0", "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 eee48ea24..646f56f25 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.22.0", + "react-router-dom": "6.22.0", "serverless": "3.34.0", "start-server-and-test": "2.0.0", "ts-jest": "29.1.0", diff --git a/components-internal/anchor/package.json b/components-internal/anchor/package.json index e0bbcfe5d..ef7988ef2 100644 --- a/components-internal/anchor/package.json +++ b/components-internal/anchor/package.json @@ -26,7 +26,7 @@ "dependencies": { "@not-govuk/component-helpers": "workspace:^0.8.2", "@not-govuk/route-utils": "workspace:^0.8.2", - "history": "^4.10.1", + "history": "^5.3.0", "react-router-hash-link": "^2.4.3" }, "peerDependencies": { diff --git a/lib/app-composer/package.json b/lib/app-composer/package.json index 9d91df75f..faf272351 100644 --- a/lib/app-composer/package.json +++ b/lib/app-composer/package.json @@ -26,8 +26,8 @@ "@not-govuk/user-info": "^0.8.2", "react": "^16.9.35", "react-helmet-async": "^1.0.7", - "react-router": "^5.1.7", - "react-router-dom": "^5.1.5" + "react-router": "^6.22.0", + "react-router-dom": "^6.22.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/component-test-helpers/package.json b/lib/component-test-helpers/package.json index 82988422f..71728bb7e 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": "^6.22.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/forms/package.json b/lib/forms/package.json index c455dc3ee..2fe66d782 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": "^6.22.0" }, "devDependencies": { "@types/react": "16.14.38", diff --git a/lib/route-utils/package.json b/lib/route-utils/package.json index 3e3bcacf7..398366988 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": "^6.22.0" }, "devDependencies": { "@types/history": "4.7.11", diff --git a/package.json b/package.json index 073dfee33..550ea018a 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,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.22.0", + "react-router-dom": "6.22.0", "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 3f063d106..fd61e6e2e 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": "^6.22.0", + "react-router-dom": "^6.22.0" }, "devDependencies": { "@not-govuk/component-test-helpers": "workspace:^0.8.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1caaffe51..7f233414c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,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.22.0 + react-router-dom: 6.22.0 ts-jest: 29.1.0 typescript: 4.9.5 webpack: 5.80.0 @@ -83,8 +83,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_wcqkhtmu7mswc6yz4uyexck3ty - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.22.0_react@16.14.0 + react-router-dom: 6.22.0_wcqkhtmu7mswc6yz4uyexck3ty ts-jest: 29.1.0_2i32d7in62azdv4buyebjqbxrq typescript: 4.9.5 webpack: 5.80.0_webpack-cli@5.0.2 @@ -118,8 +118,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.22.0 + react-router-dom: 6.22.0 serverless: 3.34.0 start-server-and-test: 2.0.0 ts-jest: 29.1.0 @@ -153,8 +153,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_wcqkhtmu7mswc6yz4uyexck3ty - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.22.0_react@16.14.0 + react-router-dom: 6.22.0_wcqkhtmu7mswc6yz4uyexck3ty serverless: 3.34.0 start-server-and-test: 2.0.0 ts-jest: 29.1.0_doipufordlnvh5g4adbwayvyvy @@ -194,8 +194,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.22.0 + react-router-dom: 6.22.0 serverless: 3.34.0 start-server-and-test: 2.0.0 ts-jest: 29.1.0 @@ -233,8 +233,8 @@ importers: react: 16.14.0 react-dom: 16.14.0_react@16.14.0 react-helmet-async: 1.3.0_wcqkhtmu7mswc6yz4uyexck3ty - react-router: 5.3.4_react@16.14.0 - react-router-dom: 5.3.4_react@16.14.0 + react-router: 6.22.0_react@16.14.0 + react-router-dom: 6.22.0_wcqkhtmu7mswc6yz4uyexck3ty serverless: 3.34.0 start-server-and-test: 2.0.0 ts-jest: 29.1.0_doipufordlnvh5g4adbwayvyvy @@ -253,7 +253,7 @@ importers: '@types/react': 16.14.38 '@types/react-router': 5.1.20 '@types/react-router-hash-link': 2.4.9 - history: ^4.10.1 + history: ^5.3.0 jest: 29.5.0 jest-environment-jsdom: 29.5.0 react-router-hash-link: ^2.4.3 @@ -262,7 +262,7 @@ importers: dependencies: '@not-govuk/component-helpers': link:../../lib/component-helpers '@not-govuk/route-utils': link:../../lib/route-utils - history: 4.10.1 + history: 5.3.0 react-router-hash-link: 2.4.3 devDependencies: '@mdx-js/react': 1.6.22 @@ -1893,7 +1893,7 @@ importers: '@types/history': 4.7.11 '@types/react-router': 5.1.20 '@types/url-parse': 1.4.11 - history: 4.10.1 + history: 5.3.0 jest: 29.5.0 jest-environment-jsdom: 29.5.0 qs: ^6.11.0 @@ -1901,7 +1901,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: @@ -4757,6 +4757,11 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: false + /@remix-run/router/1.15.0: + resolution: {integrity: sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==} + engines: {node: '>=14.0.0'} + dev: true + /@serverless/dashboard-plugin/6.2.3_supports-color@8.1.1: resolution: {integrity: sha512-iTZhpZbiVl6G2AyfgoqxemqqpG4pUceWys3GsyZtjimnfnGd2UFBOMVUMTavLhYia7lQc4kQVuXQ+afLlkg+pQ==} engines: {node: '>=12.0'} @@ -12465,15 +12470,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==} @@ -13312,10 +13313,6 @@ packages: dependencies: is-docker: 2.2.1 - /isarray/0.0.1: - resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} - dev: true - /isarray/1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -15769,12 +15766,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 - dev: true - /path-type/1.1.0: resolution: {integrity: sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==} engines: {node: '>=0.10.0'} @@ -16502,19 +16493,17 @@ 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.22.0_wcqkhtmu7mswc6yz4uyexck3ty: + resolution: {integrity: sha512-z2w+M4tH5wlcLmH3BMMOMdrtrJ9T3oJJNsAlBJbwk+8Syxd5WFJ7J5dxMEW0/GEXD1BBis4uXRrNIz3mORr0ag==} + engines: {node: '>=14.0.0'} 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.15.0 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.22.0_react@16.14.0 dev: true /react-router-hash-link/2.4.3: @@ -16526,21 +16515,14 @@ packages: prop-types: 15.8.1 dev: false - /react-router/5.3.4_react@16.14.0: - resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==} + /react-router/6.22.0_react@16.14.0: + resolution: {integrity: sha512-q2yemJeg6gw/YixRlRnVx6IRJWZD6fonnfZhN1JIOhV2iJCPeRNSH3V1ISwHf+JWcESzLC3BOLD1T07tmO5dmg==} + engines: {node: '>=14.0.0'} 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.15.0 react: 16.14.0 - react-is: 16.13.1 - tiny-invariant: 1.3.1 - tiny-warning: 1.0.3 dev: true /react-sizeme/3.0.2: @@ -16909,9 +16891,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'} @@ -18369,11 +18348,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==} @@ -19020,9 +18997,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'}