Merge branch 'dependabot-npm_and_yarn-react-router-dom-7.1.1' into 'main' (dbc99c50) · Commits · sc07 / Canvas

package-lock.json

+46 −23

Original line number	Diff line number	Diff line
		@@ -6664,14 +6664,6 @@
		"@redis/client": "^1.0.0"
		}
		},
		"node_modules/@remix-run/router": {
		"version": "1.21.0",
		"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
		"integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
		"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",
		@@ -13734,33 +13726,54 @@
		}
		},
		"node_modules/react-router": {
		"version": "6.28.1",
		"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.1.tgz",
		"integrity": "sha512-2omQTA3rkMljmrvvo6WtewGdVh45SpL9hGiCI9uUrwGGfNFDIvGK4gYJsKlJoNVi6AQZcopSCballL+QGOm7fA==",
		"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.21.0"
		"@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.28.1",
		"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.1.tgz",
		"integrity": "sha512-YraE27C/RdjcZwl5UCqF/ffXnZDxpJdk9Q6jw38SZHjXs7NNdpViq2l2c7fO7+4uWaEfcwfGCv3RSg4e1By/fQ==",
		"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.21.0",
		"react-router": "6.28.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/react-router/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/react-router/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/react-textarea-autosize": {
		@@ -14345,6 +14358,11 @@
		"node": ">= 0.8.0"
		}
		},
		"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",
		@@ -15770,6 +15788,11 @@
		"@esbuild/win32-x64": "0.23.1"
		}
		},
		"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",
		@@ -16531,7 +16554,7 @@
		"localforage": "^1.10.0",
		"match-sorter": "^8.0.0",
		"react-apexcharts": "^1.7.0",
		"react-router-dom": "^6.28.1"
		"react-router-dom": "^7.1.1"
		},
		"devDependencies": {
		"eslint-plugin-react-refresh": "^0.4.16",

packages/admin/package.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		"localforage": "^1.10.0",
		"match-sorter": "^8.0.0",
		"react-apexcharts": "^1.7.0",
		"react-router-dom": "^6.28.1"
		"react-router-dom": "^7.1.1"
		},
		"devDependencies": {
		"eslint-plugin-react-refresh": "^0.4.16",