diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3b244224a..f2e112e4f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -94,6 +94,7 @@ updates: tanstack-router: patterns: - "@tanstack/react-router" + - "@tanstack/react-router-*" - "@tanstack/router-*" tanstack-query: patterns: diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 29ffe0bd9..6c2368ef1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -13,7 +13,7 @@ "@radix-ui/react-collapsible": "^1.1.3", "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.67.3", - "@tanstack/react-router": "^1.114.13", + "@tanstack/react-router": "^1.114.17", "@vector-im/compound-design-tokens": "4.0.1", "@vector-im/compound-web": "^7.6.4", "@zxcvbn-ts/core": "^3.0.4", @@ -43,8 +43,8 @@ "@storybook/react-vite": "^8.6.4", "@storybook/test": "^8.5.5", "@tanstack/react-query-devtools": "^5.67.3", - "@tanstack/router-devtools": "^1.114.13", - "@tanstack/router-vite-plugin": "^1.114.13", + "@tanstack/react-router-devtools": "^1.114.17", + "@tanstack/router-plugin": "^1.114.17", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", "@testing-library/user-event": "^14.6.1", @@ -5383,14 +5383,14 @@ } }, "node_modules/@tanstack/react-router": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/react-router/-/react-router-1.114.13.tgz", - "integrity": "sha512-cW216LAfdmviaIU3enpWE/lS05cOo8zAeBZ8GHGpmFU/z+4ZHIcTMvs4pG8WnDA5hMFnpaLXBmYQx1Z4URXKkQ==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/react-router/-/react-router-1.114.17.tgz", + "integrity": "sha512-Dzp0wdiQDlOrORf2kwfgX+r6GH3eoC+xK+wjrBhAg3MVciE6+b5/oDHHNrM0WHb3+Lqa0slbsmbHL7/HHU4dwg==", "license": "MIT", "dependencies": { "@tanstack/history": "1.114.12", "@tanstack/react-store": "^0.7.0", - "@tanstack/router-core": "1.114.12", + "@tanstack/router-core": "1.114.17", "jsesc": "^3.1.0", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" @@ -5408,13 +5408,13 @@ } }, "node_modules/@tanstack/react-router-devtools": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/react-router-devtools/-/react-router-devtools-1.114.13.tgz", - "integrity": "sha512-YFAer7H4H8Io34mMu+kQU1p2/Vl4bon62g8Tha+b0pfnMnWhTjkJAapYIr8JCs1HsHD1F/R4CXR0REbOUMWEzQ==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/react-router-devtools/-/react-router-devtools-1.114.17.tgz", + "integrity": "sha512-/Of2oJGuWrVEXrFI8w+aPGkKhAxz8ATg1dT7dHWNwaISFOODHQGOk4kXd6nnzZNckIVGTBsAkHgQXvJ59GK43w==", "dev": true, "license": "MIT", "dependencies": { - "@tanstack/router-devtools-core": "^1.114.12", + "@tanstack/router-devtools-core": "^1.114.17", "solid-js": "^1.9.5" }, "engines": { @@ -5425,8 +5425,8 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "peerDependencies": { - "@tanstack/react-router": "^1.114.13", - "@tanstack/router-devtools-core": "^1.114.12", + "@tanstack/react-router": "^1.114.17", + "@tanstack/router-devtools-core": "^1.114.17", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } @@ -5450,9 +5450,9 @@ } }, "node_modules/@tanstack/router-core": { - "version": "1.114.12", - "resolved": "https://registry.npmjs.org/@tanstack/router-core/-/router-core-1.114.12.tgz", - "integrity": "sha512-cHhQJz3yJ5BkRe3JxtRfvmk4ynV89k1yudMQRK/1PeUV5eVEB0cIEECDk8Nlp3w9mPFS3U1iYby9hje4kP4h4g==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/router-core/-/router-core-1.114.17.tgz", + "integrity": "sha512-t7ww8LZR0LH96TD9OEupuloyWGDmLGEG20rW1Adve/a5b+u4yap/Vf+aznzrMT+GZ/zyTWLJy2zQg+DjEEUMPA==", "license": "MIT", "dependencies": { "@tanstack/history": "1.114.12", @@ -5466,40 +5466,10 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, - "node_modules/@tanstack/router-devtools": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/router-devtools/-/router-devtools-1.114.13.tgz", - "integrity": "sha512-5bG7eplJFxNVVj9dJWSS61kfHNFtkDBvK9pURU/tIpR2oKoq9uaaIOTLPa2ZiLi4XiTa6sfW9BZ2OXyCDh1v+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tanstack/react-router-devtools": "^1.114.13", - "clsx": "^2.1.1", - "goober": "^2.1.16" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/react-router": "^1.114.13", - "csstype": "^3.0.10", - "react": ">=18.0.0 || >=19.0.0", - "react-dom": ">=18.0.0 || >=19.0.0" - }, - "peerDependenciesMeta": { - "csstype": { - "optional": true - } - } - }, "node_modules/@tanstack/router-devtools-core": { - "version": "1.114.12", - "resolved": "https://registry.npmjs.org/@tanstack/router-devtools-core/-/router-devtools-core-1.114.12.tgz", - "integrity": "sha512-PmiY1szpIp7IVwA8WLoxJ4LnA/HGRLORxMtgWSf5IQXCdRzrYKAy2p2ymVAt190c4D1JeLdJYGLxthLvvUPflA==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/router-devtools-core/-/router-devtools-core-1.114.17.tgz", + "integrity": "sha512-DOUvqXSI/GDhkPT9r9ltoTVvgBHSLIdR9f3k6Eg9fNd5Co3gBCrjWLuS9vbvMq/4xaTD6UbRzNWxaycZOF7NMw==", "dev": true, "license": "MIT", "dependencies": { @@ -5514,7 +5484,7 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "peerDependencies": { - "@tanstack/router-core": "^1.114.12", + "@tanstack/router-core": "^1.114.17", "csstype": "^3.0.10", "solid-js": ">=1.9.5", "tiny-invariant": "^1.3.3" @@ -5526,9 +5496,9 @@ } }, "node_modules/@tanstack/router-generator": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/router-generator/-/router-generator-1.114.13.tgz", - "integrity": "sha512-ZsQnrXIbhFLDABBY6lWP5Ds4pxc0LFfLaVEvqemIgtf3LLGcNbEEJ1pKgDswHm6F+aay2TQaHeUbBdNZv1+8uQ==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/router-generator/-/router-generator-1.114.17.tgz", + "integrity": "sha512-zDhZKIKNArMh6iXvZnNgkWxN8P/VYvC3MX4JtxObzAYKqTA4U6OZme4t4xa8audgwxVaGhjdiqjTUcctAYT2TA==", "dev": true, "license": "MIT", "dependencies": { @@ -5545,7 +5515,7 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "peerDependencies": { - "@tanstack/react-router": "^1.114.13" + "@tanstack/react-router": "^1.114.17" }, "peerDependenciesMeta": { "@tanstack/react-router": { @@ -5554,9 +5524,9 @@ } }, "node_modules/@tanstack/router-plugin": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/router-plugin/-/router-plugin-1.114.13.tgz", - "integrity": "sha512-/03evwDwaAiwD+hGSbHoP60o+eV3icdadJgh5wWWkMEQpXU21c5sBq/3MDxY1NgUjnCEeFInN0crkKC1Uguo5w==", + "version": "1.114.17", + "resolved": "https://registry.npmjs.org/@tanstack/router-plugin/-/router-plugin-1.114.17.tgz", + "integrity": "sha512-HmknDPXLa7oN6/KpTl7i/Eu6wjSJTgpoUAM3FpaPbjeZBdUe4O8PUi80rRmimpnpRVe4psCkuKzoXEznsNbIvA==", "dev": true, "license": "MIT", "dependencies": { @@ -5566,8 +5536,8 @@ "@babel/template": "^7.26.8", "@babel/traverse": "^7.26.8", "@babel/types": "^7.26.8", - "@tanstack/router-core": "^1.114.12", - "@tanstack/router-generator": "^1.114.13", + "@tanstack/router-core": "^1.114.17", + "@tanstack/router-generator": "^1.114.17", "@tanstack/router-utils": "^1.114.12", "@tanstack/virtual-file-routes": "^1.114.12", "@types/babel__core": "^7.20.5", @@ -5587,7 +5557,7 @@ }, "peerDependencies": { "@rsbuild/core": ">=1.0.2", - "@tanstack/react-router": "^1.114.13", + "@tanstack/react-router": "^1.114.17", "vite": ">=5.0.0 || >=6.0.0", "vite-plugin-solid": "^2.11.2", "webpack": ">=5.92.0" @@ -5644,23 +5614,6 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, - "node_modules/@tanstack/router-vite-plugin": { - "version": "1.114.13", - "resolved": "https://registry.npmjs.org/@tanstack/router-vite-plugin/-/router-vite-plugin-1.114.13.tgz", - "integrity": "sha512-4GuyrtSF2oGNbSz05r+YCB+wiJ26k3sE5KhRpQwEWlhdNiXKmh5Ik4ZkGJyu2g4Q4U8mO1VRQ7ULrkuFApyGGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tanstack/router-plugin": "^1.114.13" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, "node_modules/@tanstack/store": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.7.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index d19140d34..c2e241fc7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,7 +23,7 @@ "@radix-ui/react-collapsible": "^1.1.3", "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.67.3", - "@tanstack/react-router": "^1.114.13", + "@tanstack/react-router": "^1.114.17", "@vector-im/compound-design-tokens": "4.0.1", "@vector-im/compound-web": "^7.6.4", "@zxcvbn-ts/core": "^3.0.4", @@ -53,8 +53,8 @@ "@storybook/react-vite": "^8.6.4", "@storybook/test": "^8.5.5", "@tanstack/react-query-devtools": "^5.67.3", - "@tanstack/router-devtools": "^1.114.13", - "@tanstack/router-vite-plugin": "^1.114.13", + "@tanstack/react-router-devtools": "^1.114.17", + "@tanstack/router-plugin": "^1.114.17", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", "@testing-library/user-event": "^14.6.1", diff --git a/frontend/src/routes/__root.tsx b/frontend/src/routes/__root.tsx index a4ab23b30..a4a58506e 100644 --- a/frontend/src/routes/__root.tsx +++ b/frontend/src/routes/__root.tsx @@ -11,7 +11,7 @@ import { Outlet, createRootRouteWithContext, } from "@tanstack/react-router"; -import { TanStackRouterDevtools } from "@tanstack/router-devtools"; +import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"; import GenericError from "../components/GenericError"; import Layout, { query } from "../components/Layout"; import NotFound from "../components/NotFound"; diff --git a/frontend/tsconfig.node.json b/frontend/tsconfig.node.json index 053992522..5aa949a51 100644 --- a/frontend/tsconfig.node.json +++ b/frontend/tsconfig.node.json @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "module": "ESNext", - "moduleResolution": "Node", + "module": "node16", + "moduleResolution": "node16", "allowSyntheticDefaultImports": true, "allowJs": true, "resolveJsonModule": true diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 548cc1a88..c250dbf92 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -8,7 +8,7 @@ import { readFile, writeFile } from "node:fs/promises"; import { resolve } from "node:path"; import { codecovVitePlugin } from "@codecov/vite-plugin"; -import { TanStackRouterVite as tanStackRouter } from "@tanstack/router-vite-plugin"; +import { TanStackRouterVite as tanStackRouter } from "@tanstack/router-plugin/vite"; import react from "@vitejs/plugin-react"; import browserslistToEsbuild from "browserslist-to-esbuild"; import type { Manifest, PluginOption } from "vite";