From 22a87d88127efea334e9209b6c9804c647bedade Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:23:45 +0000 Subject: [PATCH 1/2] Bump react-router-dom from 6.23.1 to 7.1.1 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.23.1 to 7.1.1. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.1.1/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 69 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2722129..980375e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "prop-types": "15.8.1", "react": "19.0.0", "react-dom": "19.0.0", - "react-router-dom": "6.23.1" + "react-router-dom": "7.1.1" }, "devDependencies": { "@eslint/js": "^9.17.0", @@ -1142,14 +1142,6 @@ } } }, - "node_modules/@remix-run/router": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", - "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.29.1", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz", @@ -1550,6 +1542,11 @@ "@babel/types": "^7.20.7" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -2737,6 +2734,14 @@ "dev": true, "license": "MIT" }, + "node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "engines": { + "node": ">=18" + } + }, "node_modules/copy-anything": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", @@ -6156,33 +6161,41 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-router": { - "version": "6.23.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz", - "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.1.tgz", + "integrity": "sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==", "dependencies": { - "@remix-run/router": "1.16.1" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/react-router-dom": { - "version": "6.23.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz", - "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.1.tgz", + "integrity": "sha512-vSrQHWlJ5DCfyrhgo0k6zViOe9ToK8uT5XGSmnuC2R3/g261IdIMpZVqfjD6vWSXdnf5Czs4VA/V60oVR6/jnA==", "dependencies": { - "@remix-run/router": "1.16.1", - "react-router": "6.23.1" + "react-router": "7.1.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" } }, "node_modules/readdirp": { @@ -6525,6 +6538,11 @@ "semver": "bin/semver.js" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -7223,6 +7241,11 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", "dev": true }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 7bdf86d..d2f5f76 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "prop-types": "15.8.1", "react": "19.0.0", "react-dom": "19.0.0", - "react-router-dom": "6.23.1" + "react-router-dom": "7.1.1" }, "scripts": { "start": "vite", From de4c7c32a67ab3d53b65047d278f64ec39f1fa33 Mon Sep 17 00:00:00 2001 From: Frank Riccobono Date: Fri, 10 Jan 2025 22:45:15 -0500 Subject: [PATCH 2/2] Update imports --- src/App.tsx | 2 +- src/TournamentScreen.spec.tsx | 2 +- src/TournamentScreen.tsx | 2 +- src/certificates.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index ddc7ec4..741fbc6 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,7 +14,7 @@ import { Route, Routes, useParams, -} from "react-router-dom"; +} from "react-router"; import { Certificates, Postings, Slides } from "./certificates"; import { StreamingDashboard } from "./StreamingDashboard"; import { Mailing } from "./Mailing"; diff --git a/src/TournamentScreen.spec.tsx b/src/TournamentScreen.spec.tsx index b6c2377..8a1d32f 100644 --- a/src/TournamentScreen.spec.tsx +++ b/src/TournamentScreen.spec.tsx @@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react"; import { TournamentScreen } from "./TournamentScreen"; import { describe, expect, it, vi } from "vitest"; import { TournamentContext } from "./tournament-context"; -import { MemoryRouter } from "react-router-dom"; +import { MemoryRouter } from "react-router"; vi.mock("@react-keycloak/web", () => { // noinspection JSUnusedGlobalSymbols diff --git a/src/TournamentScreen.tsx b/src/TournamentScreen.tsx index 001205b..c3ab0f4 100644 --- a/src/TournamentScreen.tsx +++ b/src/TournamentScreen.tsx @@ -5,7 +5,7 @@ import { EventDisplay } from "./EventDisplay"; import { Result } from "./App"; import { Debate, Qualifier, Speaker, Trophy } from "./icons"; import { useTournament } from "./use-tournament"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import cx from "classnames"; export interface Tournament { diff --git a/src/certificates.tsx b/src/certificates.tsx index 6351376..b9e45a0 100644 --- a/src/certificates.tsx +++ b/src/certificates.tsx @@ -1,5 +1,5 @@ import { RefObject, useEffect, useRef } from "react"; -import { useParams } from "react-router-dom"; +import { useParams } from "react-router"; import { getData } from "./fetch"; import { useKeycloak } from "@react-keycloak/web"; import styles from "./App.module.css";