From 8bfe9dac4ded25bde173d8d7fa03713931887dc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:13:35 +0100 Subject: [PATCH] Bump React router to ^6.28.0 (#15362) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas Tyla Co-authored-by: Jose Quintas --- docs/package.json | 4 ++-- pnpm-lock.yaml | 36 +++++++++++++++++----------------- test/package.json | 2 +- test/regressions/index.test.ts | 12 +++++++----- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/docs/package.json b/docs/package.json index 4992c2b55857f..7a114684c3018 100644 --- a/docs/package.json +++ b/docs/package.json @@ -86,8 +86,8 @@ "react-dom": "^18.3.1", "react-hook-form": "^7.53.2", "react-is": "^18.3.1", - "react-router": "^6.27.0", - "react-router-dom": "^6.27.0", + "react-router": "^6.28.0", + "react-router-dom": "^6.28.0", "react-runner": "^1.0.5", "react-simple-code-editor": "^0.14.1", "recast": "^0.23.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c64a5007299c7..8205636a86513 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -606,11 +606,11 @@ importers: specifier: ^18.3.1 version: 18.3.1 react-router: - specifier: ^6.27.0 - version: 6.27.0(react@18.3.1) + specifier: ^6.28.0 + version: 6.28.0(react@18.3.1) react-router-dom: - specifier: ^6.27.0 - version: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.28.0 + version: 6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-runner: specifier: ^1.0.5 version: 1.0.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1637,8 +1637,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) react-router-dom: - specifier: ^6.27.0 - version: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.28.0 + version: 6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) semver: specifier: ^7.6.3 version: 7.6.3 @@ -3762,8 +3762,8 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - '@remix-run/router@1.20.0': - resolution: {integrity: sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==} + '@remix-run/router@1.21.0': + resolution: {integrity: sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==} engines: {node: '>=14.0.0'} '@rollup/rollup-android-arm-eabi@4.18.1': @@ -8834,15 +8834,15 @@ packages: resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} engines: {node: '>=0.10.0'} - react-router-dom@6.27.0: - resolution: {integrity: sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==} + react-router-dom@6.28.0: + resolution: {integrity: sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' - react-router@6.27.0: - resolution: {integrity: sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==} + react-router@6.28.0: + resolution: {integrity: sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' @@ -12829,7 +12829,7 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@remix-run/router@1.20.0': {} + '@remix-run/router@1.21.0': {} '@rollup/rollup-android-arm-eabi@4.18.1': optional: true @@ -18813,16 +18813,16 @@ snapshots: react-refresh@0.14.2: {} - react-router-dom@6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-router: 6.27.0(react@18.3.1) + react-router: 6.28.0(react@18.3.1) - react-router@6.27.0(react@18.3.1): + react-router@6.28.0(react@18.3.1): dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0 react: 18.3.1 react-runner@1.0.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): diff --git a/test/package.json b/test/package.json index 7a1c8d31af9dd..5519298234342 100644 --- a/test/package.json +++ b/test/package.json @@ -33,7 +33,7 @@ "prop-types": "^15.8.1", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.27.0", + "react-router-dom": "^6.28.0", "semver": "^7.6.3", "stylis": "^4.3.4", "stylis-plugin-rtl": "^2.1.1" diff --git a/test/regressions/index.test.ts b/test/regressions/index.test.ts index e776d6f45185c..472ba8ee836c8 100644 --- a/test/regressions/index.test.ts +++ b/test/regressions/index.test.ts @@ -17,13 +17,15 @@ const isMaterialUIv6 = materialPackageJson.version.startsWith('6.'); const timeSensitiveSuites = ['ColumnAutosizingAsync', 'DensitySelectorGrid']; const isConsoleWarningIgnored = (msg?: string) => { - if ( - msg && + const isMuiV6Error = isMaterialUIv6 && - msg.startsWith( + msg?.startsWith( 'MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.', - ) - ) { + ); + + const isReactRouterFlagsError = msg?.includes('React Router Future Flag Warning'); + + if (isMuiV6Error || isReactRouterFlagsError) { return true; } return false;