diff --git a/.changeset/rsbuild-manifest-module-chunks-once.md b/.changeset/rsbuild-manifest-module-chunks-once.md new file mode 100644 index 0000000000..02febd9d84 --- /dev/null +++ b/.changeset/rsbuild-manifest-module-chunks-once.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: the Start manifest pass that runs after every client compilation (builds and each dev update) reads an imported module's chunks once per compilation and counts the module once per importing chunk, instead of once per import connection. The manifest is unchanged; the pass takes about 40 % less time (on a 333-route app, tens of milliseconds less per HMR update). diff --git a/.changeset/rsbuild-manifest-own-chunks.md b/.changeset/rsbuild-manifest-own-chunks.md new file mode 100644 index 0000000000..04e8e29928 --- /dev/null +++ b/.changeset/rsbuild-manifest-own-chunks.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: a route's client manifest entry lists only its own chunks and CSS. When two routes shared a module in a chunk of its own, each route's entry also listed the other route's chunk as a preload and its stylesheet. diff --git a/.changeset/rsbuild-rule-use-falsy-loaders.md b/.changeset/rsbuild-rule-use-falsy-loaders.md new file mode 100644 index 0000000000..a84a054fbd --- /dev/null +++ b/.changeset/rsbuild-rule-use-falsy-loaders.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +fix: the Rsbuild RSC integration skips falsy entries in a rule's `use` array (Rspack's conditionally disabled loaders) instead of treating them as loaders. diff --git a/.changeset/rsbuild-virtual-modules-build.md b/.changeset/rsbuild-virtual-modules-build.md new file mode 100644 index 0000000000..01a0c5ee6e --- /dev/null +++ b/.changeset/rsbuild-virtual-modules-build.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: fix the Rsbuild plugin build after two changes to its virtual modules crossed. Without this fix the package does not build, so no release could ship it. The Rsbuild dev manifest is written to its virtual module under the app's root. diff --git a/.changeset/rsbuild-virtual-modules-root.md b/.changeset/rsbuild-virtual-modules-root.md new file mode 100644 index 0000000000..427043a712 --- /dev/null +++ b/.changeset/rsbuild-virtual-modules-root.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: Start writes its virtual modules under the app's root, not the working directory. An app built or served from another directory (`rsbuild build --root ` from a monorepo root) no longer fails with "Module not found" on the packages they import, such as RSC's serialization adapters. diff --git a/.changeset/rsc-security-floor.md b/.changeset/rsc-security-floor.md new file mode 100644 index 0000000000..9c828f13b3 --- /dev/null +++ b/.changeset/rsc-security-floor.md @@ -0,0 +1,8 @@ +--- +'@tanstack/react-start-rsc': patch +--- + +Raise the minimum RSC bundler peer dependencies to versions with the React Server Components fixes for GHSA-xqc2-xf4c-x3h3 (CVE-2026-126187, unauthenticated RCE) and GHSA-h3gv-c5rc-p453 (server function DoS): + +- `@vitejs/plugin-rsc` to `>=0.5.38` (GHSA-59pf-q495-3c99), which vendors a fixed `react-server-dom-webpack`. +- `react-server-dom-rspack` to `>=0.1.1`, the first release built from React sources that include the fix. diff --git a/.changeset/start-server-fn-custom-id-check.md b/.changeset/start-server-fn-custom-id-check.md new file mode 100644 index 0000000000..384f0ade06 --- /dev/null +++ b/.changeset/start-server-fn-custom-id-check.md @@ -0,0 +1,7 @@ +--- +'@tanstack/start-plugin-core': minor +--- + +A server function id that a custom `serverFns.generateFunctionId` returns and that never worked over HTTP now fails the build, with an error naming the file, the function and the id: whitespace, a control or non-ASCII character, any of `"`, `#`, `/`, `<`, `>`, `?`, `\`, `^`, `` ` ``, `{`, `}`, the ids `.` and `..`, and a percent-encoding the server reads as another id (`%41`, lowercase hex, `%2E`) or rejects. The client puts the id in the URL unencoded, so a `#` or `?` ended the path and a `/` cut the id short (the call silently ran another server function of the file or none), and the other characters reached the server percent-encoded and matched no function. An id embedding a non-ASCII `functionName` is one of these. One case did work and now fails the build: such an id on a server function only SSR code called. + +Ids with `%` or the other characters URLs allow (such as `:`, `@`, `+`, `=`, `,`, `;`, `!`, `*`, `(`, `)`, `&`, `'`, `|`, `[`, `]`) still build and reach their handler, with a deprecation warning (from the Vite plugin; the Rsbuild plugin does not print compiler warnings yet): the next major version rejects them, since proxies and servers may decode or rewrite them (hash the inputs instead, as the documented example does). An id with `'` no longer breaks the server bundle. diff --git a/.changeset/start-vite-root-library-discovery.md b/.changeset/start-vite-root-library-discovery.md new file mode 100644 index 0000000000..d4e8221c59 --- /dev/null +++ b/.changeset/start-vite-root-library-discovery.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Vite: Start finds the Start libraries it bundles in the SSR build from Vite's root, not the working directory. A `vite build ` run from another directory (a monorepo root, a script) no longer leaves them external and uncompiled, where their server fns returned `undefined`. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a33150af03..9dd0def7bd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -4,6 +4,14 @@ body: - type: markdown attributes: value: | + + Thank you for reporting an issue :pray:. This issue tracker is for reporting bugs found in TanStack Router and/or Start. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1245a0a0fd..a5ef10f1ff 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,3 +12,11 @@ - [ ] This change affects published code, and I have generated a [changeset](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md). - [ ] This change is docs/CI/dev-only (no release). + + diff --git a/.github/renovate.json b/.github/renovate.json index 01be1ce5c2..6fd5aa1c86 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -21,7 +21,6 @@ "@types/node", "@types/react", "@types/react-dom", - "h3", "node", "react", "react-dom", diff --git a/.github/workflows/client-nav-benchmarks.yml b/.github/workflows/benchmarks.yml similarity index 71% rename from .github/workflows/client-nav-benchmarks.yml rename to .github/workflows/benchmarks.yml index 3862ea66dc..d5163e2368 100644 --- a/.github/workflows/client-nav-benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -22,10 +22,11 @@ on: - '!packages/**/__tests__/**' - '!packages/**/*.test.*' - 'benchmarks/**' + - '.nvmrc' workflow_dispatch: concurrency: - group: client-nav-benchmarks-${{ github.ref }} + group: benchmarks-${{ github.ref }} cancel-in-progress: false queue: single @@ -62,7 +63,22 @@ jobs: mode: memory - benchmark: memory-client mode: memory - runs-on: ubuntu-latest + # Pinned to ubuntu-24.04 (not ubuntu-latest) because: + # - `mode: simulation` (client-nav, ssr) runs under CodSpeed's own valgrind + # build, which only exists for specific Ubuntu releases. ubuntu-latest moved + # to 26.04 in Nov 2026, and the runner bundled with CodSpeedHQ/action v5.2.1 + # (runner 5.2.1) fails there with a bare "Unsupported system" error. + # `mode: memory` doesn't use valgrind, so only the CPU jobs broke. + # - An OS change silently shifts every CodSpeed baseline, so OS upgrades + # should be deliberate, not whenever GitHub moves ubuntu-latest. + # + # Blocker for moving to 26.04 / ubuntu-latest: Ubuntu 26.04 support landed in + # CodSpeedHQ/runner v5.7.0, but no CodSpeedHQ/action release bundles it yet + # (v5.6.3 ships runner 5.6.3). Check the `.codspeed-runner-version` file at + # https://github.com/CodSpeedHQ/action. Once an action release ships runner + # >= 5.7.0, bump the action pin below and this `runs-on` in the same PR, + # and expect a one-time jump in every baseline. + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml index 5d628ff768..51ffa28e4c 100644 --- a/.github/workflows/bundle-size.yml +++ b/.github/workflows/bundle-size.yml @@ -9,12 +9,18 @@ on: - 'packages/**' - 'benchmarks/**' - 'scripts/benchmarks/bundle-size/**' + - '.nvmrc' + - 'package.json' + - 'pnpm-lock.yaml' push: branches: [main] paths: - 'packages/**' - 'benchmarks/**' - 'scripts/benchmarks/bundle-size/**' + - '.nvmrc' + - 'package.json' + - 'pnpm-lock.yaml' workflow_dispatch: concurrency: @@ -103,6 +109,8 @@ jobs: cat benchmarks/bundle-size/results/pr-comment.md - name: Upsert Sticky PR Comment + # Fork PRs have a read-only GITHUB_TOKEN, so they cannot update comments. + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | @@ -112,7 +120,7 @@ jobs: benchmark-main: name: Publish Bundle Size History - if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' + if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/compiler-platforms.yml b/.github/workflows/compiler-platforms.yml new file mode 100644 index 0000000000..ad70e39bb6 --- /dev/null +++ b/.github/workflows/compiler-platforms.yml @@ -0,0 +1,101 @@ +name: Compiler Platforms + +# The main PR workflow only runs on Linux x64 (glibc). The compilers load a +# native Yuku binary per platform and handle platform-specific paths, so run +# their unit tests and a Vite and Rsbuild production build on the other +# platforms we ship to. + +on: + pull_request: + paths: + - 'packages/router-utils/**' + - 'packages/router-generator/**' + - 'packages/router-plugin/**' + - 'packages/start-plugin-core/**' + - 'pnpm-lock.yaml' + - '.github/workflows/compiler-platforms.yml' + schedule: + # Weekly, to catch new Yuku releases and runner image updates + - cron: '0 6 * * 1' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +env: + NX_DAEMON: 'false' + NX_NO_CLOUD: 'true' + +defaults: + run: + shell: bash + +jobs: + compiler: + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + # actions/setup-node only ships glibc builds, so musl uses Alpine's Node image + container: ${{ matrix.container }} + strategy: + fail-fast: false + matrix: + include: + - name: Windows x64 + os: windows-latest + - name: macOS arm64 + os: macos-latest + - name: Linux arm64 + os: ubuntu-24.04-arm + - name: Linux x64 musl + os: ubuntu-latest + container: node:24.8.0-alpine3.22@sha256:3e843c608bb5232f39ecb2b25e41214b958b0795914707374c8acc28487dea17 + steps: + - name: Install system packages + if: ${{ matrix.container }} + shell: sh + run: apk add --no-cache bash git + - name: Keep LF line endings + # Snapshots are stored with LF. Windows runners check out CRLF by default, + # and with `* text=auto` disabling autocrlf alone still uses the native eol + run: | + git config --global core.autocrlf false + git config --global core.eol lf + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + persist-credentials: false + - name: Setup pnpm + if: ${{ !matrix.container }} + uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 + - name: Setup Node + if: ${{ !matrix.container }} + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 + with: + node-version-file: .nvmrc + package-manager-cache: false + - name: Setup pnpm (container) + if: ${{ matrix.container }} + run: npm install --global "$(node -p "require('./package.json').packageManager")" + - name: Install dependencies + run: >- + pnpm install --frozen-lockfile + --filter . + --filter "@tanstack/router-utils..." + --filter "@tanstack/router-generator..." + --filter "@tanstack/router-plugin..." + --filter "@tanstack/start-plugin-core..." + --filter "tanstack-react-start-e2e-basic..." + - name: Unit tests + run: >- + pnpm nx run-many --targets=test:unit + --projects=@tanstack/router-utils,@tanstack/router-generator,@tanstack/router-plugin,@tanstack/start-plugin-core + --skip-nx-cache --outputStyle=static + - name: Production builds + run: >- + pnpm nx run-many --targets=build:vite:ssr,build:rsbuild:ssr + --projects=tanstack-react-start-e2e-basic + --skip-nx-cache --outputStyle=static diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d8c779b170..fde1100409 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -9,6 +9,8 @@ permissions: jobs: labeler: + # Fork PRs have a read-only GITHUB_TOKEN, so they cannot update labels. + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} runs-on: ubuntu-latest steps: - name: Labeller diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 71026a0a92..ae19b4f0d2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,6 +10,13 @@ concurrency: env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} SERVER_PRESET: 'node-server' + # Enable dynamic task packing for distributed CI. + NX_CLOUD_AGENT_TASK_QUEUE: true + NX_CLOUD_AUTO_TASK_PACKING: true + NX_CLOUD_AGENT_UNCAPPED_GROUP_WORK: true + NX_CLOUD_PACKING_MEM_MULTIPLIER: 1.5 + NX_CLOUD_BUFFER_TASK_COMPLETIONS: true + NX_CLOUD_CONTINUOUS_ASSIGNMENT: true permissions: contents: read @@ -26,8 +33,8 @@ jobs: with: fetch-depth: 0 persist-credentials: false - - name: Start Nx Agents - run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml" + - name: Start Nx Workers + run: npx nx-cloud start-workers - name: Setup Tools uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main - name: Get base and head commits for `nx affected` @@ -36,9 +43,9 @@ jobs: main-branch-name: main - name: Run Checks run: pnpm run test:pr --parallel=3 - - name: Stop Nx Agents + - name: Stop Nx Workers if: ${{ always() }} - run: npx nx-cloud stop-all-agents + run: npx nx-cloud stop-all-workers preview: name: Preview runs-on: ubuntu-latest diff --git a/.nvmrc b/.nvmrc index b404027604..63f87c20ef 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.8.0 +26.12.1 diff --git a/.nx/ci-config.yaml b/.nx/ci-config.yaml new file mode 100644 index 0000000000..2f0783feb4 --- /dev/null +++ b/.nx/ci-config.yaml @@ -0,0 +1,5 @@ +dte: + distribute-on: + small-changeset: 6 linux-medium-js + medium-changeset: 12 linux-medium-js + large-changeset: 18 linux-medium-js diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml deleted file mode 100644 index 39d858d5b2..0000000000 --- a/.nx/workflows/dynamic-changesets.yaml +++ /dev/null @@ -1,4 +0,0 @@ -distribute-on: - small-changeset: 4 linux-medium-js - medium-changeset: 8 linux-medium-js - large-changeset: 16 linux-medium-js diff --git a/.nx/workflows/sandboxing-config.yaml b/.nx/workflows/ultracache-config.yaml similarity index 88% rename from .nx/workflows/sandboxing-config.yaml rename to .nx/workflows/ultracache-config.yaml index c6f527f6b2..b3ed223621 100644 --- a/.nx/workflows/sandboxing-config.yaml +++ b/.nx/workflows/ultracache-config.yaml @@ -1,21 +1,21 @@ -exclude-reads: +ignore-reads: - e2e/.gitignore - '**/src/routeTree.gen.ts' -exclude-writes: +ignore-writes: - '**/src/routeTree.gen.ts' task-exclusions: - target: test:build - exclude-reads: + ignore-reads: - LICENSE # HMR tests edit these inputs in place and restore their original contents. # Keep them out of cached outputs so cache replay never overwrites source. - project: tanstack-react-start-e2e-deferred-hydration target: test:e2e - exclude-writes: + ignore-writes: - e2e/react-start/deferred-hydration/src/routes/components.tsx - project: tanstack-react-start-e2e-hmr target: test:e2e - exclude-writes: &hmr-source-writes + ignore-writes: &hmr-source-writes - e2e/react-start/hmr/src/components/AliasedRouteImportChildPanel.tsx - e2e/react-start/hmr/src/components/AliasedRouteImportParentPanel.tsx - e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts @@ -32,25 +32,25 @@ task-exclusions: - e2e/react-start/hmr/src/routes/inputs.tsx - project: tanstack-react-start-e2e-hmr target: test:e2e--vite-ssr - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-hmr target: test:e2e--vite-ssr--bundled-dev - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-hmr target: test:e2e--rsbuild-ssr - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-rsbuild target: test:e2e--rsbuild-ssr - exclude-writes: + ignore-writes: - e2e/react-start/rsbuild/src/routes/index.tsx - project: tanstack-react-start-e2e-server-functions target: test:e2e - exclude-writes: + ignore-writes: - e2e/react-start/server-functions/src/routes/consistent.tsx # Scaffolding tests deliberately populate tracked empty route fixtures. - project: '@tanstack/router-generator' target: test:unit - exclude-writes: + ignore-writes: - packages/router-generator/tests/generator/custom-scaffolding/routes/__root.tsx - packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx - packages/router-generator/tests/generator/custom-scaffolding/routes/foo.lazy.tsx @@ -58,67 +58,67 @@ task-exclusions: # These reads are of scratch files created by the same test invocation. - project: tanstack-solid-start-e2e-basic-auth target: test:e2e - exclude-reads: + ignore-reads: - e2e/solid-start/basic-auth/.tmp/dev.db - project: tanstack-vue-start-e2e-basic-auth target: test:e2e - exclude-reads: + ignore-reads: - e2e/vue-start/basic-auth/.tmp/dev.db - project: '@tanstack/router-generator' target: test:unit - exclude-reads: + ignore-reads: - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.tsx - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.lazy.tsx # Mutable counters are scratch state, not artifacts to replay from cache. - project: tanstack-react-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/react-start/basic-tsr-config/count.txt - project: tanstack-solid-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/solid-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/solid-start/basic-tsr-config/count.txt - project: tanstack-vue-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/vue-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/vue-start/basic-tsr-config/count.txt # Paraglide downloads compiler plugins from the URLs in settings.json. # Ignore warm-cache reads; the settings remain inputs and cache files outputs. - project: tanstack-react-start-e2e-i18n-paraglide target: build - exclude-reads: + ignore-reads: - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-e2e-react-i18n-paraglide target: build - exclude-reads: + ignore-reads: - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-react-start-e2e-i18n-paraglide target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-e2e-react-i18n-paraglide target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/react/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-start-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/react/start-i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-solid-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/solid/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-solid-start-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/solid/start-i18n-paraglide/project.inlang/cache/plugins/* diff --git a/AGENTS.md b/AGENTS.md index 41d28bbd38..f47b5103e1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -8,16 +8,19 @@ ## Work and validation - Start bug fixes with a failing regression test that uses only public APIs to reproduce and assert user- or developer-visible behavior. Do not manufacture bugs by mutating internals. Establish whether real usage can reach the failing state before adding runtime handling; simplify handling of states proven unreachable. +- When removing an API, option, or behavior, delete its tests. Never add tests that assert the removed thing is gone, such as `not.toHaveProperty('oldName')`, a type error for the old call, or a runtime throw. - For suspected dependency issues, verify the upstream root cause, then propose an upstream fix to the user, including for other `@tanstack/*` packages. **Never implement a workaround in this repository unless the user explicitly authorizes it.** - During debugging/prototyping, keep fixes aligned with the PR's intended architecture. If making a test pass requires another flag, counter, copied deadline, or duplicate completion authority, stop and consolidate state and ownership. Remove superseded paths instead of accumulating patches and bundle growth. - Use Node from `.nvmrc` and pnpm from root `package.json`. Install at the root with `CI=1 pnpm install --frozen-lockfile`. - For sandbox-blocked registry/store access, escalate the same command; report the blocker if unavailable. Do not change stores, delete dependencies/lockfiles, use `--force`/`--ignore-scripts`, or weaken workspace trust/build policies to bypass it. - Never manually edit `pnpm-lock.yaml` or any `routeTree.gen.ts`. Regenerate the lockfile with `pnpm install --no-frozen-lockfile` after intentional dependency changes; regenerate route trees through app builds/dev servers or the generator fixture harness. - Always use control-flow braces. Run `pnpm format` before validation. -- Use Nx: workspace imports consume built packages, so direct runners can test stale dependencies. Inspect resolved targets; some are inferred. +- Use Nx: workspace imports consume built packages, so direct runners can test stale dependencies. Inspect resolved targets with `pnpm nx show project --json`; some are inferred. +- Run finite validation through `run-many` with explicit projects and targets, including a single project/target. Nx automatically selects `summary` output when it detects an AI agent: omit `--outputStyle` for normal runs. Read the reported full log files for failures; use `--outputStyle=summary` if agent detection is unavailable. +- Use `--outputStyle=static` or `pnpm nx run :` only when diagnosing a task and its full output is needed. Continuous/watch targets may use live output. ```sh -CI=1 NX_DAEMON=false pnpm nx run : --outputStyle=stream --skipRemoteCache +CI=1 NX_DAEMON=false pnpm nx run-many -p -t --skipRemoteCache ``` - Run one Nx command at a time. For a ~20-second startup/graph stall, stop, run `pnpm nx reset`, and retry once, then escalate. Do not apply that timeout to running tests. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce76a5ba5d..4b6e808af1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,6 +142,14 @@ pnpm dev ## AI-assisted contributions + + AI tools can be useful for exploring the codebase, drafting changes, and writing tests. They do not replace the contributor's responsibility for the result. 1. **Keep the contribution in your own voice**. Review and rewrite generated code comments, issue reports, and pull request descriptions so they reflect what you actually mean. diff --git a/_artifacts/domain_map.yaml b/_artifacts/domain_map.yaml index 4b5d6f8386..0b2672f0c6 100644 --- a/_artifacts/domain_map.yaml +++ b/_artifacts/domain_map.yaml @@ -147,13 +147,15 @@ skills: context types to not flow into loader. wrong_pattern: | createFileRoute('/posts')({ - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ ...postsQuery, staleTime: 'static' }), beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), }) correct_pattern: | createFileRoute('/posts')({ beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ ...postsQuery, staleTime: 'static' }), }) source: 'docs/router/eslint/create-route-property-order.md' priority: HIGH @@ -536,7 +538,7 @@ skills: - '@tanstack/react-router-ssr-query' covers: - External cache coordination pattern - - queryClient.ensureQueryData in loader + - "queryClient.query with staleTime: 'static' in loader" - useSuspenseQuery in components - setupRouterSsrQueryIntegration - defaultPreloadStaleTime @@ -579,11 +581,11 @@ skills: priority: HIGH status: active - - mistake: 'Awaiting prefetchQuery in loader blocks rendering' + - mistake: 'Awaiting a fire-and-forget query in loader blocks rendering' mechanism: >- - For streaming/deferred patterns, prefetchQuery should NOT - be awaited in the loader — it starts fetching on server - and streams without blocking. Awaiting defeats the purpose. + For streaming/deferred patterns, start a query without awaiting + it and handle failures with catch(noop) — it starts fetching on + the server and streams without blocking. Awaiting defeats the purpose. source: 'docs/router/integrations/query.md' priority: MEDIUM status: active diff --git a/_artifacts/skill_spec.md b/_artifacts/skill_spec.md index 4503afb48a..7eb9554a42 100644 --- a/_artifacts/skill_spec.md +++ b/_artifacts/skill_spec.md @@ -83,11 +83,11 @@ TanStack Router is a type-safe router for React and Solid applications with buil ### external-data-loading (3 failure modes) -| # | Mistake | Priority | Source | Cross-skill? | -| --- | ------------------------------------------------- | -------- | -------------------------------- | ------------ | -| 1 | Not setting defaultPreloadStaleTime to 0 | HIGH | docs/guide/external-data-loading | — | -| 2 | Creating QueryClient outside createRouter for SSR | HIGH | docs/guide/external-data-loading | — | -| 3 | Awaiting prefetchQuery in loader blocks rendering | MEDIUM | docs/integrations/query | — | +| # | Mistake | Priority | Source | Cross-skill? | +| --- | ----------------------------------------------------------- | -------- | -------------------------------- | ------------ | +| 1 | Not setting defaultPreloadStaleTime to 0 | HIGH | docs/guide/external-data-loading | — | +| 2 | Creating QueryClient outside createRouter for SSR | HIGH | docs/guide/external-data-loading | — | +| 3 | Awaiting a fire-and-forget query in loader blocks rendering | MEDIUM | docs/integrations/query | — | ### auth-and-guards (3 failure modes) diff --git a/_artifacts/skill_tree.yaml b/_artifacts/skill_tree.yaml index ec38a04bdd..6f7c4c8742 100644 --- a/_artifacts/skill_tree.yaml +++ b/_artifacts/skill_tree.yaml @@ -246,7 +246,7 @@ skills: package: 'packages/react-router' description: >- Integrating TanStack Router with TanStack Query: queryClient - in router context, ensureQueryData/prefetchQuery in loaders, + in router context, static queries and fire-and-forget queries in loaders, useSuspenseQuery in components, defaultPreloadStaleTime: 0, setupRouterSsrQueryIntegration for SSR dehydration/hydration and streaming, per-request QueryClient isolation. diff --git a/benchmarks/AGENTS.md b/benchmarks/AGENTS.md index 268e23d9cc..9d56a2411a 100644 --- a/benchmarks/AGENTS.md +++ b/benchmarks/AGENTS.md @@ -10,4 +10,6 @@ Read the relevant README before running benchmarks. Compare baseline and candida Use `test:perf:` through Nx. Plain memory runs only smoke-test; memory metrics require CodSpeed. Client navigation benchmarks do not cover Start hydration or client server-function calls. +Run `vitest bench` directly only with `--mode benchmark`, as the Nx targets do. Vitest 5 otherwise uses Vite's `test` mode, where vite-plugin-solid injects a jest-dom setup file that benchmark packages cannot resolve. + For bundle-size work, follow the full optimization skill required by the root guide. Full API fixtures are maintained manually: when public hooks/components change, update matching `bundle-size/scenarios/*-full/src/routes/__root.tsx` fixtures. Save baseline results separately because each run overwrites `bundle-size/results/current.json`; report final gzip deltas and explain remaining growth. diff --git a/benchmarks/README.md b/benchmarks/README.md index 7e9a5f4248..94d2f31802 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -76,7 +76,7 @@ Node and use `setImmediate` directly. Dispatch the existing `Benchmarks` workflow against an unchanged branch: ```sh -gh workflow run client-nav-benchmarks.yml --ref +gh workflow run benchmarks.yml --ref ``` Wait for each workflow run to finish before dispatching the next repetition at diff --git a/benchmarks/bundle-size/README.md b/benchmarks/bundle-size/README.md index b5f7404480..2185d6b43f 100644 --- a/benchmarks/bundle-size/README.md +++ b/benchmarks/bundle-size/README.md @@ -42,7 +42,7 @@ pnpm benchmark:bundle-size:run --scenario react-router.minimal,react-router.full The runner calls `measure.mjs`, which builds the selected package projects through Nx. Full runs build the package projects for all scenarios. `pnpm benchmark:bundle-size` uses the Nx build cache for the full benchmark, then generates `current.json` with the current commit, branch, dirty status, and report timestamp. CI uses this command as well. -Nx caches the bundles, `measurements.json`, and `benchmark-action.json`. Git metadata does not affect the build cache. The report preserves the original `measuredAt` and build duration when measurements come from cache; `generatedAt` records when the report was generated. Running `pnpm nx run @benchmarks/bundle-size:build` directly produces only the cacheable outputs; run `node scripts/benchmarks/bundle-size/report.mjs` afterward to refresh `current.json`. +Nx caches the bundles, `measurements.json`, and `benchmark-action.json`. Git metadata does not affect the build cache. The report preserves the original `measuredAt` and build duration when measurements come from cache; `generatedAt` records when the report was generated. Running `pnpm nx run @benchmarks/bundle-size:measure` directly produces only the cacheable outputs; run `node scripts/benchmarks/bundle-size/report.mjs` afterward to refresh `current.json`. If the required packages are already built and unchanged, skip that step: diff --git a/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json index 283f675e44..ca34cd6cd7 100644 --- a/benchmarks/bundle-size/package.json +++ b/benchmarks/bundle-size/package.json @@ -3,12 +3,13 @@ "private": true, "type": "module", "scripts": { - "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds --measurements-only", + "measure": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds --measurements-only", "test:unit": "node --test ../../scripts/benchmarks/bundle-size/pr-report.test.mjs ../../scripts/benchmarks/bundle-size/run.test.mjs ../../scripts/benchmarks/bundle-size/report.test.mjs ../../scripts/benchmarks/bundle-size/build.test.mjs ../../scripts/benchmarks/bundle-size/compress.test.mjs ../../scripts/benchmarks/bundle-size/timings.test.mjs" }, "nx": { "targets": { - "build": { + "measure": { + "cache": true, "inputs": [ "buildProduction", "^buildProduction", @@ -67,7 +68,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-plugin": "workspace:^", "@types/react": "^19.0.8", diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index b49bc02376..ec34ecc0c1 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -59,6 +59,7 @@ be attributed to a specific feature area. | `head` | `HeadContent` per-navigation work: nested route `head()` evaluation, title/meta/link dedupe across matches, and head tag DOM updates during navigation. | | `history` | History push/replace/back/forward traversal, location masking, registered-but-never-blocking `useBlocker`, and `useCanGoBack`/`useLocation` subscriptions. | | `hydration` | Initial DOM hydration: execute the SSR payload, restore `beforeLoad` context and loader data, and hydrate 192 ordinary and eight hash-sensitive Links through their follow-up effects in React and Solid. | +| `link-churn` | Links that depart, stay and mount: 30 `/hub` layout Links stay while 100 `/hub/list` leaf Links leave (alone, or with the layout to `/other`) and remount on return; a search-only change rebuilds updater and `to="."` Links. Unlike `links`, whose root-layout Links never depart. | | `links` | Per-navigation cost of ~200 mounted ``s: link prop building, active-state recompute across `activeOptions` variants, `activeProps` swaps, and `useMatchRoute` probes (the `MatchRoute` component is avoided: vue-router's implementation leaks one subscription per render). | | `loaders` | Client loader dispatch: always-stale re-runs (`staleTime: 0`), cached revisits (re-run once per lap by the `invalidate` step), `loaderDeps`-keyed caching, `router.invalidate()`, and `useLoaderData` selectors. | | `mount` | Cold start: `createRouter` (route-tree processing) + first render + initial `router.load()` + unmount, with a fresh router per mount. | @@ -77,6 +78,7 @@ scenarios follow these navigation/mount conventions: - Scenarios behave like a real user app: navigation happens through `` clicks dispatched on real anchor elements (unless a scenario specifically measures the imperative API), the router uses the default browser history, and `scrollRestoration` is enabled. - Each benchmark iteration advances a fixed, circular sequence of steps; every step awaits the router's `onRendered` event, so render work is included and steps cannot overlap. No two consecutive steps may target the same location, and the sequence ends back on the initial route. - Setup runs one warm-up lap through the sequence and asserts each step's observable output (e.g. `document.title`), so a scenario that silently stops doing its work fails instead of reporting a fast time. +- Apps are mounted and disposed outside timing by `benchLifecycle` (`benchmarks/cpu-simulation.ts`): CodSpeed measures a single invocation, so every invocation gets a freshly mounted app; plain `vitest bench` keeps one app per warmup/run phase. Bench functions must be `async` functions, because CodSpeed's Vitest 5 provider awaits only `AsyncFunction`s. - Determinism: no wall-clock timers (async work is resolved promises or counted `setTimeout(0)` hops), `staleTime`/`gcTime` only ever `0` or effectively-infinite, no `Math.random`/`Date.now` in the measured loop. Scroll restoration uses `getScrollRestorationKey: (location) => location.pathname` so its cache stays bounded (the default random per-entry key grows one cache entry per push navigation). The `mount` scenario opts out of `scrollRestoration` entirely and destroys its history on unmount — both register page-lifetime globals that would leak across its mount/unmount loop. - Push-only step laps grow jsdom's session-history entry list over a run (jsdom never truncates entries behind the current index). Per-push cost stays O(1) so timings are unaffected; only the `history` scenario needs — and has — a lap that is depth-stationary. - Calibration: pick per-iteration step counts so a bench's `vitest bench` run stays roughly between 8 and 30 seconds (long enough to average out, short enough for CI). @@ -101,7 +103,7 @@ Run a single scenario app manually (after building it through Nx): ```bash CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav--:build:client --outputStyle=stream --skipRemoteCache -cd benchmarks/client-nav && NODE_ENV=production vitest bench --config ./scenarios///vite.config.ts +cd benchmarks/client-nav && NODE_ENV=production vitest bench --mode benchmark --config ./scenarios///vite.config.ts ``` Run framework-specific flame benchmarks (10 second loop, profiled with `@platformatic/flame`, forced to `NODE_ENV=production`): @@ -155,8 +157,11 @@ the existing DOM with the framework's native renderer: - **React:** a separate completion component signals from its post-hydration effect, after the same snapshot transition as hash-sensitive Links. The harness awaits that signal and two idle React scheduler turns, then checks the expected - active links. Concurrent hydration can take as many turns as needed under CPU - instrumentation, with a 60-second failure watchdog. + active links. The window's `performance.now()` is frozen, so React's + scheduler yields only to paint after commits, not after 5 ms of wall time, which CPU + instrumentation stretches by a runner-dependent factor. Each sample therefore + uses the same number of scheduler tasks. `Date.now()` is unchanged. A + 60-second watchdog fails a sample that never settles. - **Solid:** execute the native hydration bootstrap and retain the server's component/key hierarchy. Wait for mount, the router's rendered event, active-link effects, and two idle turns. DOM identity assertions include every workload @@ -174,11 +179,10 @@ task cancellation, and window disposal also run outside measurement. Diagnostic tests count Link renders or reactive evaluations and check they stop before the measured region ends; counting is disabled in the timed workload. -CodSpeed uses suite `beforeEach`/`afterEach` hooks. Ordinary Vitest instead -installs Tinybench's public Task iteration hooks from its stage-level `setup`. -Using only stage-level setup would let later iterations reuse an already -hydrated document. The hydration unit tests cover fresh-state setup through -both paths. +The bench's own `beforeEach`/`afterEach` hooks prepare and dispose every +sample outside timing, in both CodSpeed and ordinary Vitest runs. Per-phase +setup would let later iterations reuse an already hydrated document. The +hydration unit tests cover repeated fresh-state setup. Each scenario is included in its framework's aggregate build and CodSpeed run. Land the benchmark independently to establish main's baseline before comparing a @@ -192,7 +196,7 @@ construction. `scenarios/mount` includes construction but also rendering and loading. To isolate initialization, use the core construction benchmark: ```bash -CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --outputJson /tmp/route-tree-construction.json +CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --reporter=json --outputFile=/tmp/route-tree-construction.json ``` It covers 100, 1,000, and 10,000 static, dynamic, nested, or mixed routes. @@ -216,7 +220,7 @@ CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:cl CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run # Select a feature and save the normal Vitest JSON report. -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --outputJson /tmp/link-perf.json +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --reporter=json --outputFile=/tmp/link-perf.json ``` The cases cover repeated versus unique destination params, updater functions, diff --git a/benchmarks/client-nav/link-performance/client.bench.ts b/benchmarks/client-nav/link-performance/client.bench.ts index 086fadd161..f819fab52b 100644 --- a/benchmarks/client-nav/link-performance/client.bench.ts +++ b/benchmarks/client-nav/link-performance/client.bench.ts @@ -1,4 +1,5 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../cpu-simulation' import { LINK_CASES } from './cases' import { createClientScenario, samplingOptions } from './scenario' import type * as App from './src/client' @@ -10,7 +11,7 @@ if (app.serverEnvironment !== false) { } for (const { id, label } of LINK_CASES) { - describe(label, () => { + test(label, async ({ bench }) => { const scenario = createClientScenario(app, id) function finish() { try { @@ -19,13 +20,11 @@ for (const { id, label } of LINK_CASES) { scenario.teardown() } } - beforeEach(scenario.setup) - afterEach(finish) - bench(`client Links: ${id}`, scenario.batch, { - ...samplingOptions, - setup: scenario.setup, - teardown: finish, - }) + await bench( + `client Links: ${id}`, + benchLifecycle({ before: scenario.setup, after: finish }), + scenario.batch, + ).run(samplingOptions) }) } diff --git a/benchmarks/client-nav/link-performance/project.json b/benchmarks/client-nav/link-performance/project.json index 899f013818..fd1751c081 100644 --- a/benchmarks/client-nav/link-performance/project.json +++ b/benchmarks/client-nav/link-performance/project.json @@ -36,7 +36,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.client.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.client.config.ts", "cwd": "benchmarks/client-nav" } }, @@ -45,7 +45,7 @@ "cache": false, "dependsOn": ["build:ssr"], "options": { - "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.ssr.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.ssr.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/link-performance/ssr.bench.ts b/benchmarks/client-nav/link-performance/ssr.bench.ts index 2a4b431292..c30084e510 100644 --- a/benchmarks/client-nav/link-performance/ssr.bench.ts +++ b/benchmarks/client-nav/link-performance/ssr.bench.ts @@ -1,4 +1,5 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../cpu-simulation' import { LINK_CASES } from './cases' import { createSsrScenario, samplingOptions } from './scenario' import type * as App from './src/ssr' @@ -10,7 +11,7 @@ if (app.serverEnvironment !== true) { } for (const { id, label } of LINK_CASES) { - describe(label, () => { + test(label, async ({ bench }) => { const scenario = createSsrScenario(app, id) function finish() { try { @@ -19,13 +20,11 @@ for (const { id, label } of LINK_CASES) { scenario.teardown() } } - beforeEach(scenario.setup) - afterEach(finish) - bench(`SSR Links: ${id}`, scenario.batch, { - ...samplingOptions, - setup: scenario.setup, - teardown: finish, - }) + await bench( + `SSR Links: ${id}`, + benchLifecycle({ before: scenario.setup, after: finish }), + scenario.batch, + ).run(samplingOptions) }) } diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 1aadf1e07c..1f878adc67 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -9,10 +9,10 @@ "test:flame:react": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./react/speed.flame.ts", "test:flame:solid": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./solid/speed.flame.ts", "test:flame:vue": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./vue/speed.flame.ts", - "test:perf": "NODE_ENV=production vitest bench --config ./vitest.config.ts", - "test:perf:react": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", - "test:perf:solid": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", - "test:perf:vue": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "test:perf": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.config.ts", + "test:perf:react": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", + "test:perf:solid": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", + "test:perf:vue": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "test:types": "pnpm run test:types:react && pnpm run test:types:solid && pnpm run test:types:vue", "test:types:react": "tsc -p ./react/tsconfig.json --noEmit", "test:types:solid": "tsc -p ./solid/tsconfig.json --noEmit", @@ -31,7 +31,7 @@ }, "devDependencies": { "@platformatic/flame": "^1.6.0", - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@tanstack/router-plugin": "workspace:^", "@testing-library/react": "^16.2.0", "@vitejs/plugin-react": "^6.0.1", @@ -65,6 +65,7 @@ "@benchmarks/client-nav-head-react", "@benchmarks/client-nav-history-react", "@benchmarks/client-nav-hydration-react", + "@benchmarks/client-nav-link-churn-react", "@benchmarks/client-nav-links-react", "@benchmarks/client-nav-loaders-react", "@benchmarks/client-nav-mount-react", @@ -94,6 +95,7 @@ "@benchmarks/client-nav-head-solid", "@benchmarks/client-nav-history-solid", "@benchmarks/client-nav-hydration-solid", + "@benchmarks/client-nav-link-churn-solid", "@benchmarks/client-nav-links-solid", "@benchmarks/client-nav-loaders-solid", "@benchmarks/client-nav-mount-solid", @@ -122,6 +124,7 @@ "@benchmarks/client-nav-control-flow-vue", "@benchmarks/client-nav-head-vue", "@benchmarks/client-nav-history-vue", + "@benchmarks/client-nav-link-churn-vue", "@benchmarks/client-nav-links-vue", "@benchmarks/client-nav-loaders-vue", "@benchmarks/client-nav-mount-vue", @@ -205,8 +208,11 @@ "@benchmarks/client-nav-history-vue", "@benchmarks/client-nav-hydration-react", "@benchmarks/client-nav-hydration-solid", + "@benchmarks/client-nav-link-churn-react", "@benchmarks/client-nav-links-react", + "@benchmarks/client-nav-link-churn-solid", "@benchmarks/client-nav-links-solid", + "@benchmarks/client-nav-link-churn-vue", "@benchmarks/client-nav-links-vue", "@benchmarks/client-nav-loaders-react", "@benchmarks/client-nav-loaders-solid", diff --git a/benchmarks/client-nav/react/speed.bench.ts b/benchmarks/client-nav/react/speed.bench.ts index fcc15b5fbc..944f182734 100644 --- a/benchmarks/client-nav/react/speed.bench.ts +++ b/benchmarks/client-nav/react/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (react)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/react/vite.config.ts b/benchmarks/client-nav/react/vite.config.ts index ea85a49a21..7df3f80e71 100644 --- a/benchmarks/client-nav/react/vite.config.ts +++ b/benchmarks/client-nav/react/vite.config.ts @@ -34,5 +34,6 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['react/speed.bench.ts'] }, }, }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts index c3f4c5231c..65dab0781e 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts index 96082e9963..acef710469 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts index 7c15baf4e9..27b9498b11 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts @@ -9,25 +9,25 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as NestedRouteImport } from './routes/nested' import { Route as IndexRouteImport } from './routes/index' -import { Route as SlowIdRouteImport } from './routes/slow.$id' -import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as NestedRouteImport } from './routes/nested' import { Route as CtxIdRouteImport } from './routes/ctx.$id' +import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as SlowIdRouteImport } from './routes/slow.$id' -const NestedRoute = NestedRouteImport.update({ - id: '/nested', - path: '/nested', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SlowIdRoute = SlowIdRouteImport.update({ - id: '/slow/$id', - path: '/slow/$id', +const NestedRoute = NestedRouteImport.update({ + id: '/nested', + path: '/nested', + getParentRoute: () => rootRouteImport, +} as any) +const CtxIdRoute = CtxIdRouteImport.update({ + id: '/ctx/$id', + path: '/ctx/$id', getParentRoute: () => rootRouteImport, } as any) const NestedIdRoute = NestedIdRouteImport.update({ @@ -35,9 +35,9 @@ const NestedIdRoute = NestedIdRouteImport.update({ path: '/$id', getParentRoute: () => NestedRoute, } as any) -const CtxIdRoute = CtxIdRouteImport.update({ - id: '/ctx/$id', - path: '/ctx/$id', +const SlowIdRoute = SlowIdRouteImport.update({ + id: '/slow/$id', + path: '/slow/$id', getParentRoute: () => rootRouteImport, } as any) @@ -80,13 +80,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/nested': { - id: '/nested' - path: '/nested' - fullPath: '/nested' - preLoaderRoute: typeof NestedRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -94,11 +87,18 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/slow/$id': { - id: '/slow/$id' - path: '/slow/$id' - fullPath: '/slow/$id' - preLoaderRoute: typeof SlowIdRouteImport + '/nested': { + id: '/nested' + path: '/nested' + fullPath: '/nested' + preLoaderRoute: typeof NestedRouteImport + parentRoute: typeof rootRouteImport + } + '/ctx/$id': { + id: '/ctx/$id' + path: '/ctx/$id' + fullPath: '/ctx/$id' + preLoaderRoute: typeof CtxIdRouteImport parentRoute: typeof rootRouteImport } '/nested/$id': { @@ -108,11 +108,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof NestedIdRouteImport parentRoute: typeof NestedRoute } - '/ctx/$id': { - id: '/ctx/$id' - path: '/ctx/$id' - fullPath: '/ctx/$id' - preLoaderRoute: typeof CtxIdRouteImport + '/slow/$id': { + id: '/slow/$id' + path: '/slow/$id' + fullPath: '/slow/$id' + preLoaderRoute: typeof SlowIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts index 193a3837df..f0fd3e58df 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts index 7f1153021f..d6f2190be7 100644 --- a/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts index a88093ca52..d803d2a313 100644 --- a/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts index 44d88e9f8d..cd84f99d5d 100644 --- a/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts @@ -9,26 +9,16 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as TargetRouteImport } from './routes/target' -import { Route as Hop2RouteImport } from './routes/hop2' -import { Route as Hop1RouteImport } from './routes/hop1' -import { Route as BrokenRouteImport } from './routes/broken' import { Route as IndexRouteImport } from './routes/index' +import { Route as BrokenRouteImport } from './routes/broken' +import { Route as Hop1RouteImport } from './routes/hop1' +import { Route as Hop2RouteImport } from './routes/hop2' +import { Route as TargetRouteImport } from './routes/target' import { Route as MissingIdRouteImport } from './routes/missing.$id' -const TargetRoute = TargetRouteImport.update({ - id: '/target', - path: '/target', - getParentRoute: () => rootRouteImport, -} as any) -const Hop2Route = Hop2RouteImport.update({ - id: '/hop2', - path: '/hop2', - getParentRoute: () => rootRouteImport, -} as any) -const Hop1Route = Hop1RouteImport.update({ - id: '/hop1', - path: '/hop1', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const BrokenRoute = BrokenRouteImport.update({ @@ -36,9 +26,19 @@ const BrokenRoute = BrokenRouteImport.update({ path: '/broken', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const Hop1Route = Hop1RouteImport.update({ + id: '/hop1', + path: '/hop1', + getParentRoute: () => rootRouteImport, +} as any) +const Hop2Route = Hop2RouteImport.update({ + id: '/hop2', + path: '/hop2', + getParentRoute: () => rootRouteImport, +} as any) +const TargetRoute = TargetRouteImport.update({ + id: '/target', + path: '/target', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -98,25 +98,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/target': { - id: '/target' - path: '/target' - fullPath: '/target' - preLoaderRoute: typeof TargetRouteImport - parentRoute: typeof rootRouteImport - } - '/hop2': { - id: '/hop2' - path: '/hop2' - fullPath: '/hop2' - preLoaderRoute: typeof Hop2RouteImport - parentRoute: typeof rootRouteImport - } - '/hop1': { - id: '/hop1' - path: '/hop1' - fullPath: '/hop1' - preLoaderRoute: typeof Hop1RouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/broken': { @@ -126,11 +112,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BrokenRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/hop1': { + id: '/hop1' + path: '/hop1' + fullPath: '/hop1' + preLoaderRoute: typeof Hop1RouteImport + parentRoute: typeof rootRouteImport + } + '/hop2': { + id: '/hop2' + path: '/hop2' + fullPath: '/hop2' + preLoaderRoute: typeof Hop2RouteImport + parentRoute: typeof rootRouteImport + } + '/target': { + id: '/target' + path: '/target' + fullPath: '/target' + preLoaderRoute: typeof TargetRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { diff --git a/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts index 9a335cfb87..8a019945c7 100644 --- a/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts index 97c76a1a11..d0d731a09f 100644 --- a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts index 075e7673de..ca156c950b 100644 --- a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts index ead6a4436a..b6f217e527 100644 --- a/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts @@ -9,15 +9,15 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as SettingsRouteImport } from './routes/settings' -import { Route as DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' -import { Route as DocsSectionRouteImport } from './routes/docs.$section' +import { Route as DocsRouteImport } from './routes/docs' +import { Route as SettingsRouteImport } from './routes/settings' import { Route as ArticlesIdRouteImport } from './routes/articles.$id' +import { Route as DocsSectionRouteImport } from './routes/docs.$section' -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const DocsRoute = DocsRouteImport.update({ @@ -25,9 +25,14 @@ const DocsRoute = DocsRouteImport.update({ path: '/docs', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ArticlesIdRoute = ArticlesIdRouteImport.update({ + id: '/articles/$id', + path: '/articles/$id', getParentRoute: () => rootRouteImport, } as any) const DocsSectionRoute = DocsSectionRouteImport.update({ @@ -35,11 +40,6 @@ const DocsSectionRoute = DocsSectionRouteImport.update({ path: '/$section', getParentRoute: () => DocsRoute, } as any) -const ArticlesIdRoute = ArticlesIdRouteImport.update({ - id: '/articles/$id', - path: '/articles/$id', - getParentRoute: () => rootRouteImport, -} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -86,11 +86,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/docs': { @@ -100,11 +100,18 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/articles/$id': { + id: '/articles/$id' + path: '/articles/$id' + fullPath: '/articles/$id' + preLoaderRoute: typeof ArticlesIdRouteImport parentRoute: typeof rootRouteImport } '/docs/$section': { @@ -114,13 +121,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsSectionRouteImport parentRoute: typeof DocsRoute } - '/articles/$id': { - id: '/articles/$id' - path: '/articles/$id' - fullPath: '/articles/$id' - preLoaderRoute: typeof ArticlesIdRouteImport - parentRoute: typeof rootRouteImport - } } } diff --git a/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts index 7080b4ea7d..d188a9dd7a 100644 --- a/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/react/speed.bench.ts b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts index 9192258b66..6ec7031857 100644 --- a/benchmarks/client-nav/scenarios/history/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts index d7f4fd898d..56af035b2b 100644 --- a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts index a6ab2a4fc8..af253f4a15 100644 --- a/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as GalleryRouteImport } from './routes/gallery' import { Route as IndexRouteImport } from './routes/index' -import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' +import { Route as GalleryRouteImport } from './routes/gallery' import { Route as PagesNRouteImport } from './routes/pages.$n' +import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' -const GalleryRoute = GalleryRouteImport.update({ - id: '/gallery', - path: '/gallery', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ - id: '/photos/$photoId', - path: '/photos/$photoId', +const GalleryRoute = GalleryRouteImport.update({ + id: '/gallery', + path: '/gallery', getParentRoute: () => rootRouteImport, } as any) const PagesNRoute = PagesNRouteImport.update({ @@ -34,6 +29,11 @@ const PagesNRoute = PagesNRouteImport.update({ path: '/pages/$n', getParentRoute: () => rootRouteImport, } as any) +const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ + id: '/photos/$photoId', + path: '/photos/$photoId', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/gallery': { - id: '/gallery' - path: '/gallery' - fullPath: '/gallery' - preLoaderRoute: typeof GalleryRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/photos/$photoId': { - id: '/photos/$photoId' - path: '/photos/$photoId' - fullPath: '/photos/$photoId' - preLoaderRoute: typeof PhotosPhotoIdRouteImport + '/gallery': { + id: '/gallery' + path: '/gallery' + fullPath: '/gallery' + preLoaderRoute: typeof GalleryRouteImport parentRoute: typeof rootRouteImport } '/pages/$n': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PagesNRouteImport parentRoute: typeof rootRouteImport } + '/photos/$photoId': { + id: '/photos/$photoId' + path: '/photos/$photoId' + fullPath: '/photos/$photoId' + preLoaderRoute: typeof PhotosPhotoIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts index a378e45ac5..3d36ac4cfa 100644 --- a/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts index 295f9ceb80..7e466cbaed 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts @@ -7,12 +7,14 @@ const turn = () => new Promise((resolve) => setImmediate(resolve)) test('restores data and context into fresh DOMs and includes follow-up renders', async () => { const scenario = setup({ countRenders: true }) + const schedulerTasks = new Set() for (let iteration = 0; iteration < 3; iteration++) { await scenario.before() try { expect(scenario.snapshot().diagnostics.mounted).toBe(false) expect(scenario.snapshot().matches).toBeUndefined() await scenario.run() + schedulerTasks.add(scenario.schedulerTasks()) const completed = scenario.snapshot() // Supports both main's extra Link update and the optimized snapshot. expect([ordinaryLinkCount, ordinaryLinkCount * 2]).toContain( @@ -30,23 +32,8 @@ test('restores data and context into fresh DOMs and includes follow-up renders', await scenario.after() } } -}) - -test('installs per-iteration preparation for the ordinary Vitest runner', async () => { - const scenario = setup() - const task: Parameters[0] = { - opts: {}, - } - scenario.installIterationHooks(task) - for (let iteration = 0; iteration < 2; iteration++) { - await task.opts.beforeEach!() - try { - expect(scenario.snapshot().diagnostics.mounted).toBe(false) - await scenario.run() - } finally { - await task.opts.afterEach!() - } - } + // React yields on its pinned clock, never on wall time spent hydrating. + expect(schedulerTasks.size).toBe(1) }) test('rejects an empty measurement and still releases its sample', async () => { diff --git a/benchmarks/client-nav/scenarios/hydration/react/project.json b/benchmarks/client-nav/scenarios/hydration/react/project.json index ece8f2de66..ca23838c0f 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/project.json +++ b/benchmarks/client-nav/scenarios/hydration/react/project.json @@ -25,7 +25,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/react/vite.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/react/vite.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/scenarios/hydration/react/setup.ts b/benchmarks/client-nav/scenarios/hydration/react/setup.ts index caaa539991..7c588af3fd 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/setup.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/setup.ts @@ -9,15 +9,18 @@ import type { FixtureArtifact } from './fixture' import type * as Client from './src/client' type ClientApp = typeof Client -type TaskHooks = { - opts: { - beforeEach?: () => void | Promise - afterEach?: () => void | Promise - } -} - const turn = () => new Promise((resolve) => setImmediate(resolve)) +// React's scheduler ends a time slice once performance.now() has advanced 5 ms. +// Under CodSpeed's CPU simulation the wall clock advances much further per +// instruction, by a runner-dependent factor, so real time turned identical +// samples into different numbers of yields, scheduler tasks and event-loop +// turns. With a frozen clock React yields only to paint after a commit, as on +// a fast host. 1 s is past React's initial 300 ms fallback throttle. Only the +// window's performance clock is pinned: Date.now(), which the Router uses for +// match timestamps, is unchanged. +const schedulerTime = 1_000 + export function setup({ countRenders = false } = {}) { // Compile once, outside measurement. Evaluation below creates fresh objects // in each window's realm; neither the payload nor module state is reused. @@ -49,6 +52,7 @@ export function setup({ countRenders = false } = {}) { virtualConsole, }) const immediates = new Set() + const scheduler = { tasks: 0 } try { Object.assign(dom.window, { TextEncoder, @@ -62,6 +66,7 @@ export function setup({ countRenders = false } = {}) { callback: (...args: Array) => void, ...args: Array ) { + scheduler.tasks++ const handle = setImmediate(() => { immediates.delete(handle) callback(...args) @@ -78,6 +83,7 @@ export function setup({ countRenders = false } = {}) { }, scrollTo() {}, }) + dom.window.performance.now = () => schedulerTime const context = dom.getInternalVMContext() // jsdom has no layout/scroll implementation; only hydration CPU is measured. dom.window.HTMLElement.prototype.scrollIntoView = () => {} @@ -110,6 +116,7 @@ export function setup({ countRenders = false } = {}) { scriptElements, executingScript, immediates, + scheduler, errors, started: false, completed: false, @@ -186,6 +193,13 @@ export function setup({ countRenders = false } = {}) { > } + function schedulerTasks() { + if (!current) { + throw new Error('No hydration sample') + } + return current.scheduler.tasks + } + function validate() { assert.ok(current?.started) const { dom, anchors, content, errors } = current @@ -297,11 +311,6 @@ export function setup({ countRenders = false } = {}) { run, after, snapshot, - // Vitest passes setup to the Tinybench Bench, where it runs once per - // warmup/run stage. Install the Task's public per-iteration hooks there. - installIterationHooks(task: TaskHooks) { - task.opts.beforeEach = before - task.opts.afterEach = after - }, + schedulerTasks, } } diff --git a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts index 6f6142b9de..643877760e 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts @@ -1,23 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-hydration', () => { +test('client-hydration', async ({ bench }) => { const scenario = setup() - // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks - // installed below. Both prepare and dispose every sample outside timing. - beforeEach(scenario.before) - afterEach(scenario.after) - bench( + + await bench( 'hydrate restored route state and mixed Links (react)', + { beforeEach: scenario.before, afterEach: scenario.after }, async () => { await scenario.run() }, - { - setup: scenario.installIterationHooks, - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }, - ) + ).run({ + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }) }) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts index ca519d98bb..4e5f3208ca 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts @@ -50,21 +50,17 @@ test('restores fresh DOMs and route state and completes hash-link reactivity', a } }) -test('installs per-iteration preparation for the ordinary Vitest runner', async () => { +test('prepares every sample without counting diagnostics', async () => { const scenario = setup() - const task: Parameters[0] = { - opts: {}, - } - scenario.installIterationHooks(task) for (let iteration = 0; iteration < 2; iteration++) { - await task.opts.beforeEach!() + await scenario.before() try { expect(scenario.snapshot().diagnostics.mounted).toBe(false) expect(scenario.snapshot().diagnostics.clicks).toBe(0) await scenario.run() expect(scenario.snapshot().diagnostics.hashEvaluations).toBe(0) } finally { - await task.opts.afterEach!() + await scenario.after() } } }) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/project.json b/benchmarks/client-nav/scenarios/hydration/solid/project.json index 978fdc6bf7..1fa162771b 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/project.json +++ b/benchmarks/client-nav/scenarios/hydration/solid/project.json @@ -25,7 +25,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/solid/vite.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/solid/vite.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts index 29a86d6743..ebdbc8e9b2 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts @@ -8,13 +8,6 @@ import type { FixtureArtifact } from './fixture' import type * as Client from './src/client' type ClientApp = typeof Client -type TaskHooks = { - opts: { - beforeEach?: () => void | Promise - afterEach?: () => void | Promise - } -} - const turn = () => new Promise((resolve) => setImmediate(resolve)) const maxSettleTurns = 100 @@ -329,11 +322,5 @@ export function setup({ countUpdates = false } = {}) { run, after, snapshot, - // Vitest's Bench setup runs once per warmup/run stage. Install Tinybench's - // public Task hooks to prepare and dispose outside every measured call. - installIterationHooks(task: TaskHooks) { - task.opts.beforeEach = before - task.opts.afterEach = after - }, } } diff --git a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts index 1f91ec00f3..b386cb8215 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts @@ -1,23 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-hydration', () => { +test('client-hydration', async ({ bench }) => { const scenario = setup() - // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks - // installed below. Both prepare and dispose every sample outside timing. - beforeEach(scenario.before) - afterEach(scenario.after) - bench( + + await bench( 'hydrate restored route state and mixed Links (solid)', + { beforeEach: scenario.before, afterEach: scenario.after }, async () => { await scenario.run() }, - { - setup: scenario.installIterationHooks, - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }, - ) + ).run({ + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }) }) diff --git a/benchmarks/client-nav/scenarios/link-churn/react/project.json b/benchmarks/client-nav/scenarios/link-churn/react/project.json new file mode 100644 index 0000000000..1606b2c456 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-react", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/react-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/react-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/react/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/setup.ts b/benchmarks/client-nav/scenarios/link-churn/react/setup.ts new file mode 100644 index 0000000000..59221603da --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'React', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts new file mode 100644 index 0000000000..ca0b370528 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts @@ -0,0 +1,19 @@ +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +test('client-link-churn', async ({ bench }) => { + const scenario = setup() + + await bench( + 'client-link-churn navigation loop (react)', + benchLifecycle(scenario), + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await scenario.tick() + } + await scenario.finishBatch() + }, + ).run(benchOptions) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx new file mode 100644 index 0000000000..5febd6f795 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx @@ -0,0 +1,37 @@ +import type { RouterHistory } from '@tanstack/history' +import { RouterProvider, createRouter } from '@tanstack/react-router' +import { createRoot } from 'react-dom/client' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const reactRoot = createRoot(container) + reactRoot.render() + + return { + router, + unmount() { + reactRoot.unmount() + }, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts new file mode 100644 index 0000000000..4535430b61 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx new file mode 100644 index 0000000000..199cf1ff73 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx @@ -0,0 +1,39 @@ +import { Link, Outlet, createRootRoute } from '@tanstack/react-router' +import { sortedSearch } from '../../../shared' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + <> + + + + ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..143cb39a7a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx @@ -0,0 +1,21 @@ +import { Link, createFileRoute } from '@tanstack/react-router' +import { detailMarker } from '../../../shared' + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) + +function DetailPage() { + const params = Route.useParams() + + return ( +
+

{detailMarker(params.id)}

+ Back to list + + Next + + Elsewhere +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx new file mode 100644 index 0000000000..5aa37b20a7 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx @@ -0,0 +1,65 @@ +import { Link, createFileRoute } from '@tanstack/react-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +function ListLinks() { + return ( +
    + {listItemIds.map((id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ ...prev, page, sort: 'asc' as const })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + })} +
+ ) +} + +function ListPage() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return ( +
+

+ {sort === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx new file mode 100644 index 0000000000..ac12eae2da --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx @@ -0,0 +1,64 @@ +import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) + +// Layout Links stay mounted while the hub leaves change. +function HubLinks() { + return ( +
+ {hubItemIds.map((id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + })} +
+ ) +} + +function HubLayout() { + return ( +
+ + +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx new file mode 100644 index 0000000000..1f146b789f --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' +import { otherMarker } from '../../../shared' + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) + +function OtherPage() { + return ( +
+

{otherMarker}

+
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json new file mode 100644 index 0000000000..1d59cbb450 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "react-jsx", + "jsxImportSource": "react", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts new file mode 100644 index 0000000000..344974ebf9 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts @@ -0,0 +1,42 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import react from '@vitejs/plugin-react' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'react', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + react(), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (react)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + }, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/shared.ts b/benchmarks/client-nav/scenarios/link-churn/shared.ts new file mode 100644 index 0000000000..d936af35cc --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/shared.ts @@ -0,0 +1,178 @@ +/** + * Shared definition of the `link-churn` scenario: Links that leave, stay and + * arrive across navigations. A `/hub` layout renders Links that stay mounted + * while its leaves change; the `/hub/list` leaf renders Links that depart when + * leaving it and mount again when returning; `/other` sits outside the layout + * so leaving the list there unmounts layout and leaf Links together. The + * existing `links` scenario keeps all its Links in the root layout, so none of + * them ever departs or remounts. The three framework apps consume these + * constants so the workload is identical modulo the rendering layer. + */ +import type { ScenarioStep } from '../harness' + +// Layout (staying) Links: HUB_ITEM_COUNT ids x 5 variants. +export const HUB_ITEM_COUNT = 6 +// List leaf (departing) Links: LIST_ITEM_COUNT ids x 5 variants. +export const LIST_ITEM_COUNT = 20 + +const ids = (count: number) => + Array.from({ length: count }, (_, index) => String(index + 1)) + +export const hubItemIds = ids(HUB_ITEM_COUNT) +export const listItemIds = ids(LIST_ITEM_COUNT) + +export interface HubSearch { + page?: number + sort?: 'asc' | 'desc' +} + +/** Search validation of the `/hub` layout, inherited by its leaves. */ +export function validateHubSearch(search: Record): HubSearch { + const result: HubSearch = {} + if (typeof search.page === 'number') { + result.page = search.page + } + if (search.sort === 'asc' || search.sort === 'desc') { + result.sort = search.sort + } + return result +} + +export const sortedSearch = { sort: 'desc' } as const + +export function detailMarker(id: string) { + return `detail-${id}` +} + +export const listMarker = 'list' +export const listSortedMarker = 'list-desc' +export const otherMarker = 'other' + +// Sampled Links whose href depends on the current location: the first layout +// `to="."` updater Link and the first list `to="."` updater Link. +export const hubRelativeTestId = 'hub-relative-1' +export const listRelativeTestId = 'list-relative-1' + +interface StepDef { + testId: string + marker: string + /** Expected number of `.active-link` elements after the step. */ + activeCount: number + /** Expected href of the sampled layout updater Link (null: not mounted). */ + hubRelativeHref: string | null + /** Expected href of the sampled list updater Link (null: not mounted). */ + listRelativeHref: string | null +} + +// On the list, every layout `includeSearch: false` Link to the list is active. +const listActiveCount = HUB_ITEM_COUNT + +export const stepDefs: ReadonlyArray = [ + // 1. list -> detail/1: list Links depart, layout Links stay and update. + { + testId: 'go-detail-1', + marker: detailMarker('1'), + activeCount: 1, + hubRelativeHref: '/hub/detail/1?page=1', + listRelativeHref: null, + }, + // 2. detail/1 -> detail/2: same route, new param; every Link stays. + { + testId: 'go-detail-2', + marker: detailMarker('2'), + activeCount: 1, + hubRelativeHref: '/hub/detail/2?page=1', + listRelativeHref: null, + }, + // 3. detail/2 -> list: list Links mount. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, + // 4. list -> other: layout and list Links depart together. + { + testId: 'go-other', + marker: otherMarker, + activeCount: 0, + hubRelativeHref: null, + listRelativeHref: null, + }, + // 5. other -> list: layout and list Links all mount. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, + // 6a. list -> list?sort=desc: nothing departs, updater Links rebuild. + { + testId: 'go-list-sorted', + marker: listSortedMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?sort=desc&page=1', + listRelativeHref: '/hub/list?sort=asc&page=1', + }, + // 6b. back to the plain list so the lap ends on the initial location. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, +] + +export const initialUrl = '/hub/list' + +export const scenarioSteps: ReadonlyArray = stepDefs.map( + (step) => step.testId, +) + +function assertHref( + container: HTMLElement, + testId: string, + expected: string | null, + stepIndex: number, +) { + const link = container.querySelector(`[data-testid="${testId}"]`) + const href = link ? link.getAttribute('href') : null + if (href !== expected) { + throw new Error( + `Expected "${testId}" href ${JSON.stringify(expected)} after step ${stepIndex}, received ${JSON.stringify(href)}`, + ) + } +} + +export function assertStepResult(stepIndex: number, container: HTMLElement) { + const step = stepDefs[stepIndex]! + + const marker = container.querySelector('[data-testid="page-state"]') + if (marker?.textContent !== step.marker) { + throw new Error( + `Expected page marker "${step.marker}" after step ${stepIndex}, received "${marker?.textContent}"`, + ) + } + + const activeLinks = container.querySelectorAll('a.active-link') + if (activeLinks.length !== step.activeCount) { + throw new Error( + `Expected ${step.activeCount} active link(s) after step ${stepIndex}, received ${activeLinks.length}`, + ) + } + + assertHref(container, hubRelativeTestId, step.hubRelativeHref, stepIndex) + assertHref(container, listRelativeTestId, step.listRelativeHref, stepIndex) +} + +// One lap through the 7-step sequence per benchmark iteration. +export const ticksPerIteration = stepDefs.length + +export const benchOptions = { + warmupIterations: 50, + time: 10_000, + throws: true, +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/project.json b/benchmarks/client-nav/scenarios/link-churn/solid/project.json new file mode 100644 index 0000000000..4e46143b32 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-solid", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/solid/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts b/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts new file mode 100644 index 0000000000..a2a024341d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'Solid', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts new file mode 100644 index 0000000000..80c4aaa6fd --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts @@ -0,0 +1,19 @@ +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +test('client-link-churn', async ({ bench }) => { + const scenario = setup() + + await bench( + 'client-link-churn navigation loop (solid)', + benchLifecycle(scenario), + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await scenario.tick() + } + await scenario.finishBatch() + }, + ).run(benchOptions) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx new file mode 100644 index 0000000000..fa9d239418 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx @@ -0,0 +1,34 @@ +import type { RouterHistory } from '@tanstack/history' +import { render } from 'solid-js/web' +import { RouterProvider, createRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const unmount = render(() => , container) + + return { + router, + unmount, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts new file mode 100644 index 0000000000..e3cb546963 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx new file mode 100644 index 0000000000..a9de4ea356 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx @@ -0,0 +1,39 @@ +import { Link, Outlet, createRootRoute } from '@tanstack/solid-router' +import { sortedSearch } from '../../../shared' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + <> + + + + ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..7aca4a9935 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx @@ -0,0 +1,24 @@ +import { Link, createFileRoute } from '@tanstack/solid-router' +import { detailMarker } from '../../../shared' + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) + +function DetailPage() { + const params = Route.useParams() + + return ( +
+

{detailMarker(params().id)}

+ Back to list + + Next + + Elsewhere +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx new file mode 100644 index 0000000000..5796a50b02 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx @@ -0,0 +1,68 @@ +import { For } from 'solid-js' +import { Link, createFileRoute } from '@tanstack/solid-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +function ListLinks() { + return ( +
    + + {(id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ ...prev, page, sort: 'asc' as const })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + }} +
    +
+ ) +} + +function ListPage() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return ( +
+

+ {sort() === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx new file mode 100644 index 0000000000..4682f85aae --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx @@ -0,0 +1,67 @@ +import { For } from 'solid-js' +import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) + +// Layout Links stay mounted while the hub leaves change. +function HubLinks() { + return ( +
+ + {(id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + }} +
+
+ ) +} + +function HubLayout() { + return ( +
+ + +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx new file mode 100644 index 0000000000..2606089113 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { otherMarker } from '../../../shared' + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) + +function OtherPage() { + return ( +
+

{otherMarker}

+
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json new file mode 100644 index 0000000000..98d76ad6b8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "solid-js", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts new file mode 100644 index 0000000000..37718a2d6a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts @@ -0,0 +1,50 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import solid from 'vite-plugin-solid' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'solid', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + solid({ hot: false, dev: false }), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + resolve: { + conditions: ['solid', 'browser'], + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (solid)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + server: { + deps: { + inline: [/@solidjs/, /@tanstack\/solid-store/], + }, + }, + }, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/project.json b/benchmarks/client-nav/scenarios/link-churn/vue/project.json new file mode 100644 index 0000000000..fb890ddfb8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-vue", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/vue/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts b/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts new file mode 100644 index 0000000000..95cacb9ea8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'Vue', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts new file mode 100644 index 0000000000..dea511c24c --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts @@ -0,0 +1,19 @@ +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +test('client-link-churn', async ({ bench }) => { + const scenario = setup() + + await bench( + 'client-link-churn navigation loop (vue)', + benchLifecycle(scenario), + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await scenario.tick() + } + await scenario.finishBatch() + }, + ).run(benchOptions) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx new file mode 100644 index 0000000000..cae9b54f1d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx @@ -0,0 +1,41 @@ +import type { RouterHistory } from '@tanstack/history' +import * as Vue from 'vue' +import { RouterProvider, createRouter } from '@tanstack/vue-router' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/vue-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const component = + const app = Vue.createApp({ + render: () => component, + }) + + app.mount(container) + + return { + router, + unmount() { + app.unmount() + }, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts new file mode 100644 index 0000000000..9327bbc01d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/vue-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx new file mode 100644 index 0000000000..a4f7985c5a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx @@ -0,0 +1,46 @@ +import * as Vue from 'vue' +import { Link, Outlet, createRootRoute } from '@tanstack/vue-router' +import { sortedSearch } from '../../../shared' + +const RootComponent = Vue.defineComponent({ + setup() { + return () => ( + <> + + + + ) + }, +}) + +export const Route = createRootRoute({ + component: RootComponent, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..4701ab44eb --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx @@ -0,0 +1,27 @@ +import * as Vue from 'vue' +import { Link, createFileRoute } from '@tanstack/vue-router' +import { detailMarker } from '../../../shared' + +const DetailPage = Vue.defineComponent({ + setup() { + const params = Route.useParams() + + return () => ( +
+

{detailMarker(params.value.id)}

+ Back to list + + Next + + Elsewhere +
+ ) + }, +}) + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx new file mode 100644 index 0000000000..02abd6db1b --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx @@ -0,0 +1,74 @@ +import * as Vue from 'vue' +import { Link, createFileRoute } from '@tanstack/vue-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +const ListLinks = Vue.defineComponent({ + setup() { + return () => ( +
    + {listItemIds.map((id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ + ...prev, + page, + sort: 'asc' as const, + })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + })} +
+ ) + }, +}) + +const ListPage = Vue.defineComponent({ + setup() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return () => ( +
+

+ {sort.value === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) + }, +}) + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx new file mode 100644 index 0000000000..5be17f3350 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx @@ -0,0 +1,69 @@ +import * as Vue from 'vue' +import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +// Layout Links stay mounted while the hub leaves change. +const HubLinks = Vue.defineComponent({ + setup() { + return () => ( +
+ {hubItemIds.map((id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + })} +
+ ) + }, +}) + +const HubLayout = Vue.defineComponent({ + setup() { + return () => ( +
+ + +
+ ) + }, +}) + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx new file mode 100644 index 0000000000..08dec586fa --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx @@ -0,0 +1,17 @@ +import * as Vue from 'vue' +import { createFileRoute } from '@tanstack/vue-router' +import { otherMarker } from '../../../shared' + +const OtherPage = Vue.defineComponent({ + setup() { + return () => ( +
+

{otherMarker}

+
+ ) + }, +}) + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json new file mode 100644 index 0000000000..7786fc3da9 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "vue", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts new file mode 100644 index 0000000000..8f56734e04 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts @@ -0,0 +1,44 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import vue from '@vitejs/plugin-vue' +import vueJsx from '@vitejs/plugin-vue-jsx' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'vue', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + vue(), + vueJsx(), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (vue)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + }, +}) diff --git a/benchmarks/client-nav/scenarios/links/react/speed.bench.ts b/benchmarks/client-nav/scenarios/links/react/speed.bench.ts index 0892308901..75f5f725d4 100644 --- a/benchmarks/client-nav/scenarios/links/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts index a3d690b423..fc7f3e71e7 100644 --- a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts index b61431e40d..0da70513e8 100644 --- a/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' import { Route as ItemsIdRouteImport } from './routes/items.$id' -const AboutRoute = AboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const AboutRoute = AboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => rootRouteImport, +} as any) const ItemsIdRoute = ItemsIdRouteImport.update({ id: '/items/$id', path: '/items/$id', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/about': { - id: '/about' - path: '/about' - fullPath: '/about' - preLoaderRoute: typeof AboutRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/about': { + id: '/about' + path: '/about' + fullPath: '/about' + preLoaderRoute: typeof AboutRouteImport + parentRoute: typeof rootRouteImport + } '/items/$id': { id: '/items/$id' path: '/items/$id' diff --git a/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts index e2d3f7c47a..2ace7a8409 100644 --- a/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts index f5a51b29be..8bcc53b88e 100644 --- a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts index 9f3bd397db..953a17b31a 100644 --- a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts index bdec400237..fa5d032141 100644 --- a/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as DepsRouteImport } from './routes/deps' import { Route as IndexRouteImport } from './routes/index' -import { Route as FreshIdRouteImport } from './routes/fresh.$id' +import { Route as DepsRouteImport } from './routes/deps' import { Route as CachedIdRouteImport } from './routes/cached.$id' +import { Route as FreshIdRouteImport } from './routes/fresh.$id' -const DepsRoute = DepsRouteImport.update({ - id: '/deps', - path: '/deps', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const FreshIdRoute = FreshIdRouteImport.update({ - id: '/fresh/$id', - path: '/fresh/$id', +const DepsRoute = DepsRouteImport.update({ + id: '/deps', + path: '/deps', getParentRoute: () => rootRouteImport, } as any) const CachedIdRoute = CachedIdRouteImport.update({ @@ -34,6 +29,11 @@ const CachedIdRoute = CachedIdRouteImport.update({ path: '/cached/$id', getParentRoute: () => rootRouteImport, } as any) +const FreshIdRoute = FreshIdRouteImport.update({ + id: '/fresh/$id', + path: '/fresh/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/deps': { - id: '/deps' - path: '/deps' - fullPath: '/deps' - preLoaderRoute: typeof DepsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/fresh/$id': { - id: '/fresh/$id' - path: '/fresh/$id' - fullPath: '/fresh/$id' - preLoaderRoute: typeof FreshIdRouteImport + '/deps': { + id: '/deps' + path: '/deps' + fullPath: '/deps' + preLoaderRoute: typeof DepsRouteImport parentRoute: typeof rootRouteImport } '/cached/$id': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof CachedIdRouteImport parentRoute: typeof rootRouteImport } + '/fresh/$id': { + id: '/fresh/$id' + path: '/fresh/$id' + fullPath: '/fresh/$id' + preLoaderRoute: typeof FreshIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts index 819fe020b0..1ae2f89a56 100644 --- a/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts index 2d675ff259..6c3a64b026 100644 --- a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-mount loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts index eaf7f1ed34..236f875f57 100644 --- a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-mount loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts index dc0acc183d..30247636dd 100644 --- a/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts @@ -9,35 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as ShopRouteImport } from './routes/shop' -import { Route as SettingsRouteImport } from './routes/settings' -import { Route as SearchRouteImport } from './routes/search' -import { Route as BlogRouteImport } from './routes/blog' -import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' -import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as BlogRouteImport } from './routes/blog' +import { Route as SearchRouteImport } from './routes/search' +import { Route as SettingsRouteImport } from './routes/settings' +import { Route as ShopRouteImport } from './routes/shop' import { Route as BlogIndexRouteImport } from './routes/blog.index' -import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' import { Route as BlogSlugRouteImport } from './routes/blog.$slug' +import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' -const ShopRoute = ShopRouteImport.update({ - id: '/shop', - path: '/shop', - getParentRoute: () => rootRouteImport, -} as any) -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => rootRouteImport, -} as any) -const SearchRoute = SearchRouteImport.update({ - id: '/search', - path: '/search', - getParentRoute: () => rootRouteImport, -} as any) -const BlogRoute = BlogRouteImport.update({ - id: '/blog', - path: '/blog', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const AboutRoute = AboutRouteImport.update({ @@ -45,31 +30,46 @@ const AboutRoute = AboutRouteImport.update({ path: '/about', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const BlogRoute = BlogRouteImport.update({ + id: '/blog', + path: '/blog', getParentRoute: () => rootRouteImport, } as any) -const ShopIndexRoute = ShopIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => ShopRoute, +const SearchRoute = SearchRouteImport.update({ + id: '/search', + path: '/search', + getParentRoute: () => rootRouteImport, +} as any) +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ShopRoute = ShopRouteImport.update({ + id: '/shop', + path: '/shop', + getParentRoute: () => rootRouteImport, } as any) const BlogIndexRoute = BlogIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogRoute, } as any) -const ShopProductIdRoute = ShopProductIdRouteImport.update({ - id: '/$productId', - path: '/$productId', - getParentRoute: () => ShopRoute, -} as any) const BlogSlugRoute = BlogSlugRouteImport.update({ id: '/$slug', path: '/$slug', getParentRoute: () => BlogRoute, } as any) +const ShopIndexRoute = ShopIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => ShopRoute, +} as any) +const ShopProductIdRoute = ShopProductIdRouteImport.update({ + id: '/$productId', + path: '/$productId', + getParentRoute: () => ShopRoute, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -154,32 +154,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/shop': { - id: '/shop' - path: '/shop' - fullPath: '/shop' - preLoaderRoute: typeof ShopRouteImport - parentRoute: typeof rootRouteImport - } - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport - parentRoute: typeof rootRouteImport - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport - parentRoute: typeof rootRouteImport - } - '/blog': { - id: '/blog' - path: '/blog' - fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/about': { @@ -189,19 +168,33 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/blog': { + id: '/blog' + path: '/blog' + fullPath: '/blog' + preLoaderRoute: typeof BlogRouteImport parentRoute: typeof rootRouteImport } - '/shop/': { - id: '/shop/' - path: '/' - fullPath: '/shop/' - preLoaderRoute: typeof ShopIndexRouteImport - parentRoute: typeof ShopRoute + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteImport + parentRoute: typeof rootRouteImport + } + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/shop': { + id: '/shop' + path: '/shop' + fullPath: '/shop' + preLoaderRoute: typeof ShopRouteImport + parentRoute: typeof rootRouteImport } '/blog/': { id: '/blog/' @@ -210,13 +203,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BlogIndexRouteImport parentRoute: typeof BlogRoute } - '/shop/$productId': { - id: '/shop/$productId' - path: '/$productId' - fullPath: '/shop/$productId' - preLoaderRoute: typeof ShopProductIdRouteImport - parentRoute: typeof ShopRoute - } '/blog/$slug': { id: '/blog/$slug' path: '/$slug' @@ -224,6 +210,20 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BlogSlugRouteImport parentRoute: typeof BlogRoute } + '/shop/': { + id: '/shop/' + path: '/' + fullPath: '/shop/' + preLoaderRoute: typeof ShopIndexRouteImport + parentRoute: typeof ShopRoute + } + '/shop/$productId': { + id: '/shop/$productId' + path: '/$productId' + fullPath: '/shop/$productId' + preLoaderRoute: typeof ShopProductIdRouteImport + parentRoute: typeof ShopRoute + } } } diff --git a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts index f5538dd49c..d9268ba91b 100644 --- a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts @@ -1,32 +1,15 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( - 'client-mount loop (vue)', - async () => { - for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() - } - await test.finishBatch() - }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + await bench('client-mount loop (vue)', benchLifecycle(scenario), async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await scenario.tick() + } + await scenario.finishBatch() + }).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts index 3dfe93c117..fa5809c1fd 100644 --- a/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts index dc7ec11f6b..2c64d9a221 100644 --- a/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts index fcb336d1db..bd3e82e070 100644 --- a/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts index 5b188a0a0b..5c210b2fd7 100644 --- a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts index 267c9fd41d..f835b4a7b9 100644 --- a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts index 645d925238..97e215b6da 100644 --- a/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' +import { Route as DocsRouteImport } from './routes/docs' import { Route as SectionsSectionRouteImport } from './routes/sections.$section' -const DocsRoute = DocsRouteImport.update({ - id: '/docs', - path: '/docs', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const DocsRoute = DocsRouteImport.update({ + id: '/docs', + path: '/docs', + getParentRoute: () => rootRouteImport, +} as any) const SectionsSectionRoute = SectionsSectionRouteImport.update({ id: '/sections/$section', path: '/sections/$section', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/docs': { - id: '/docs' - path: '/docs' - fullPath: '/docs' - preLoaderRoute: typeof DocsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/docs': { + id: '/docs' + path: '/docs' + fullPath: '/docs' + preLoaderRoute: typeof DocsRouteImport + parentRoute: typeof rootRouteImport + } '/sections/$section': { id: '/sections/$section' path: '/sections/$section' diff --git a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts index 38a2e9e664..e0ec83619b 100644 --- a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts index 8e79c6db7e..dd1b6f3686 100644 --- a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts index cf70bcaa40..9c4313e2ff 100644 --- a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts index 2dc9eb2679..e96aff39eb 100644 --- a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts index 337ba35b73..6f4b448775 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts index 545b501617..9244ef1350 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts index 20b4af6146..e6f3596562 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts @@ -9,68 +9,52 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as SecFRouteImport } from './routes/sec-f' -import { Route as SecERouteImport } from './routes/sec-e' -import { Route as SecDRouteImport } from './routes/sec-d' -import { Route as SecCRouteImport } from './routes/sec-c' -import { Route as SecBRouteImport } from './routes/sec-b' -import { Route as SecARouteImport } from './routes/sec-a' -import { Route as LayoutRouteImport } from './routes/_layout' import { Route as IndexRouteImport } from './routes/index' -import { Route as SecFIndexRouteImport } from './routes/sec-f.index' -import { Route as SecEIndexRouteImport } from './routes/sec-e.index' -import { Route as SecDIndexRouteImport } from './routes/sec-d.index' -import { Route as SecCIndexRouteImport } from './routes/sec-c.index' -import { Route as SecBIndexRouteImport } from './routes/sec-b.index' -import { Route as SecAIndexRouteImport } from './routes/sec-a.index' -import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -import { Route as SecFAboutRouteImport } from './routes/sec-f.about' -import { Route as SecFIdRouteImport } from './routes/sec-f.$id' -import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' -import { Route as SecEAboutRouteImport } from './routes/sec-e.about' -import { Route as SecEIdRouteImport } from './routes/sec-e.$id' -import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' -import { Route as SecDAboutRouteImport } from './routes/sec-d.about' -import { Route as SecDIdRouteImport } from './routes/sec-d.$id' -import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' -import { Route as SecCAboutRouteImport } from './routes/sec-c.about' -import { Route as SecCIdRouteImport } from './routes/sec-c.$id' -import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' -import { Route as SecBAboutRouteImport } from './routes/sec-b.about' -import { Route as SecBIdRouteImport } from './routes/sec-b.$id' -import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' -import { Route as SecAAboutRouteImport } from './routes/sec-a.about' -import { Route as SecAIdRouteImport } from './routes/sec-a.$id' -import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' -import { Route as FilesSplatRouteImport } from './routes/files.$' -import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' -import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' -import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as SecARouteImport } from './routes/sec-a' +import { Route as SecBRouteImport } from './routes/sec-b' +import { Route as SecCRouteImport } from './routes/sec-c' +import { Route as SecDRouteImport } from './routes/sec-d' +import { Route as SecERouteImport } from './routes/sec-e' +import { Route as SecFRouteImport } from './routes/sec-f' import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing' +import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' +import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' +import { Route as FilesSplatRouteImport } from './routes/files.$' +import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' +import { Route as SecAIndexRouteImport } from './routes/sec-a.index' +import { Route as SecAIdRouteImport } from './routes/sec-a.$id' +import { Route as SecAAboutRouteImport } from './routes/sec-a.about' +import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' +import { Route as SecBIndexRouteImport } from './routes/sec-b.index' +import { Route as SecBIdRouteImport } from './routes/sec-b.$id' +import { Route as SecBAboutRouteImport } from './routes/sec-b.about' +import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' +import { Route as SecCIndexRouteImport } from './routes/sec-c.index' +import { Route as SecCIdRouteImport } from './routes/sec-c.$id' +import { Route as SecCAboutRouteImport } from './routes/sec-c.about' +import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' +import { Route as SecDIndexRouteImport } from './routes/sec-d.index' +import { Route as SecDIdRouteImport } from './routes/sec-d.$id' +import { Route as SecDAboutRouteImport } from './routes/sec-d.about' +import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' +import { Route as SecEIndexRouteImport } from './routes/sec-e.index' +import { Route as SecEIdRouteImport } from './routes/sec-e.$id' +import { Route as SecEAboutRouteImport } from './routes/sec-e.about' +import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' +import { Route as SecFIndexRouteImport } from './routes/sec-f.index' +import { Route as SecFIdRouteImport } from './routes/sec-f.$id' +import { Route as SecFAboutRouteImport } from './routes/sec-f.about' +import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -const SecFRoute = SecFRouteImport.update({ - id: '/sec-f', - path: '/sec-f', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) -const SecERoute = SecERouteImport.update({ - id: '/sec-e', - path: '/sec-e', - getParentRoute: () => rootRouteImport, -} as any) -const SecDRoute = SecDRouteImport.update({ - id: '/sec-d', - path: '/sec-d', - getParentRoute: () => rootRouteImport, -} as any) -const SecCRoute = SecCRouteImport.update({ - id: '/sec-c', - path: '/sec-c', - getParentRoute: () => rootRouteImport, -} as any) -const SecBRoute = SecBRouteImport.update({ - id: '/sec-b', - path: '/sec-b', +const LayoutRoute = LayoutRouteImport.update({ + id: '/_layout', getParentRoute: () => rootRouteImport, } as any) const SecARoute = SecARouteImport.update({ @@ -78,134 +62,55 @@ const SecARoute = SecARouteImport.update({ path: '/sec-a', getParentRoute: () => rootRouteImport, } as any) -const LayoutRoute = LayoutRouteImport.update({ - id: '/_layout', +const SecBRoute = SecBRouteImport.update({ + id: '/sec-b', + path: '/sec-b', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SecCRoute = SecCRouteImport.update({ + id: '/sec-c', + path: '/sec-c', getParentRoute: () => rootRouteImport, } as any) -const SecFIndexRoute = SecFIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecFRoute, +const SecDRoute = SecDRouteImport.update({ + id: '/sec-d', + path: '/sec-d', + getParentRoute: () => rootRouteImport, } as any) -const SecEIndexRoute = SecEIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecERoute, +const SecERoute = SecERouteImport.update({ + id: '/sec-e', + path: '/sec-e', + getParentRoute: () => rootRouteImport, } as any) -const SecDIndexRoute = SecDIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecDRoute, +const SecFRoute = SecFRouteImport.update({ + id: '/sec-f', + path: '/sec-f', + getParentRoute: () => rootRouteImport, } as any) -const SecCIndexRoute = SecCIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecCRoute, +const marketingPricingRoute = marketingPricingRouteImport.update({ + id: '/(marketing)/pricing', + path: '/pricing', + getParentRoute: () => rootRouteImport, } as any) -const SecBIndexRoute = SecBIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecBRoute, +const marketingPromoRoute = marketingPromoRouteImport.update({ + id: '/(marketing)/promo', + path: '/promo', + getParentRoute: () => rootRouteImport, } as any) -const SecAIndexRoute = SecAIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecARoute, +const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => LayoutRoute, } as any) -const SecFSettingsRoute = SecFSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecFRoute, +const LayoutBetaRoute = LayoutBetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => LayoutRoute, } as any) -const SecFAboutRoute = SecFAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecFRoute, -} as any) -const SecFIdRoute = SecFIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecFRoute, -} as any) -const SecESettingsRoute = SecESettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecERoute, -} as any) -const SecEAboutRoute = SecEAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecERoute, -} as any) -const SecEIdRoute = SecEIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecERoute, -} as any) -const SecDSettingsRoute = SecDSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecDRoute, -} as any) -const SecDAboutRoute = SecDAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecDRoute, -} as any) -const SecDIdRoute = SecDIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecDRoute, -} as any) -const SecCSettingsRoute = SecCSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecCRoute, -} as any) -const SecCAboutRoute = SecCAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecCRoute, -} as any) -const SecCIdRoute = SecCIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecCRoute, -} as any) -const SecBSettingsRoute = SecBSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecBRoute, -} as any) -const SecBAboutRoute = SecBAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecBRoute, -} as any) -const SecBIdRoute = SecBIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecBRoute, -} as any) -const SecASettingsRoute = SecASettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecARoute, -} as any) -const SecAAboutRoute = SecAAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecARoute, -} as any) -const SecAIdRoute = SecAIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecARoute, +const FilesSplatRoute = FilesSplatRouteImport.update({ + id: '/files/$', + path: '/files/$', + getParentRoute: () => rootRouteImport, } as any) const ReleaseVChar123versionChar125Route = ReleaseVChar123versionChar125RouteImport.update({ @@ -213,30 +118,125 @@ const ReleaseVChar123versionChar125Route = path: '/release/v{$version}', getParentRoute: () => rootRouteImport, } as any) -const FilesSplatRoute = FilesSplatRouteImport.update({ - id: '/files/$', - path: '/files/$', - getParentRoute: () => rootRouteImport, +const SecAIndexRoute = SecAIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecARoute, } as any) -const LayoutBetaRoute = LayoutBetaRouteImport.update({ - id: '/beta', - path: '/beta', - getParentRoute: () => LayoutRoute, +const SecAIdRoute = SecAIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecARoute, } as any) -const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ - id: '/alpha', - path: '/alpha', - getParentRoute: () => LayoutRoute, +const SecAAboutRoute = SecAAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecARoute, } as any) -const marketingPromoRoute = marketingPromoRouteImport.update({ - id: '/(marketing)/promo', - path: '/promo', - getParentRoute: () => rootRouteImport, +const SecASettingsRoute = SecASettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecARoute, } as any) -const marketingPricingRoute = marketingPricingRouteImport.update({ - id: '/(marketing)/pricing', - path: '/pricing', - getParentRoute: () => rootRouteImport, +const SecBIndexRoute = SecBIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecBRoute, +} as any) +const SecBIdRoute = SecBIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecBRoute, +} as any) +const SecBAboutRoute = SecBAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecBRoute, +} as any) +const SecBSettingsRoute = SecBSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecBRoute, +} as any) +const SecCIndexRoute = SecCIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecCRoute, +} as any) +const SecCIdRoute = SecCIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecCRoute, +} as any) +const SecCAboutRoute = SecCAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecCRoute, +} as any) +const SecCSettingsRoute = SecCSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecCRoute, +} as any) +const SecDIndexRoute = SecDIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecDRoute, +} as any) +const SecDIdRoute = SecDIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecDRoute, +} as any) +const SecDAboutRoute = SecDAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecDRoute, +} as any) +const SecDSettingsRoute = SecDSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecDRoute, +} as any) +const SecEIndexRoute = SecEIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecERoute, +} as any) +const SecEIdRoute = SecEIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecERoute, +} as any) +const SecEAboutRoute = SecEAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecERoute, +} as any) +const SecESettingsRoute = SecESettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecERoute, +} as any) +const SecFIndexRoute = SecFIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecFRoute, +} as any) +const SecFIdRoute = SecFIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecFRoute, +} as any) +const SecFAboutRoute = SecFAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecFRoute, +} as any) +const SecFSettingsRoute = SecFSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecFRoute, } as any) export interface FileRoutesByFullPath { @@ -484,46 +484,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/sec-f': { - id: '/sec-f' - path: '/sec-f' - fullPath: '/sec-f' - preLoaderRoute: typeof SecFRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-e': { - id: '/sec-e' - path: '/sec-e' - fullPath: '/sec-e' - preLoaderRoute: typeof SecERouteImport - parentRoute: typeof rootRouteImport - } - '/sec-d': { - id: '/sec-d' - path: '/sec-d' - fullPath: '/sec-d' - preLoaderRoute: typeof SecDRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-c': { - id: '/sec-c' - path: '/sec-c' - fullPath: '/sec-c' - preLoaderRoute: typeof SecCRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-b': { - id: '/sec-b' - path: '/sec-b' - fullPath: '/sec-b' - preLoaderRoute: typeof SecBRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-a': { - id: '/sec-a' - path: '/sec-a' - fullPath: '/sec-a' - preLoaderRoute: typeof SecARouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/_layout': { @@ -533,47 +498,89 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/sec-a': { + id: '/sec-a' + path: '/sec-a' + fullPath: '/sec-a' + preLoaderRoute: typeof SecARouteImport parentRoute: typeof rootRouteImport } - '/sec-f/': { - id: '/sec-f/' - path: '/' - fullPath: '/sec-f/' - preLoaderRoute: typeof SecFIndexRouteImport - parentRoute: typeof SecFRoute + '/sec-b': { + id: '/sec-b' + path: '/sec-b' + fullPath: '/sec-b' + preLoaderRoute: typeof SecBRouteImport + parentRoute: typeof rootRouteImport } - '/sec-e/': { - id: '/sec-e/' - path: '/' - fullPath: '/sec-e/' - preLoaderRoute: typeof SecEIndexRouteImport - parentRoute: typeof SecERoute + '/sec-c': { + id: '/sec-c' + path: '/sec-c' + fullPath: '/sec-c' + preLoaderRoute: typeof SecCRouteImport + parentRoute: typeof rootRouteImport } - '/sec-d/': { - id: '/sec-d/' - path: '/' - fullPath: '/sec-d/' - preLoaderRoute: typeof SecDIndexRouteImport - parentRoute: typeof SecDRoute + '/sec-d': { + id: '/sec-d' + path: '/sec-d' + fullPath: '/sec-d' + preLoaderRoute: typeof SecDRouteImport + parentRoute: typeof rootRouteImport } - '/sec-c/': { - id: '/sec-c/' - path: '/' - fullPath: '/sec-c/' - preLoaderRoute: typeof SecCIndexRouteImport - parentRoute: typeof SecCRoute + '/sec-e': { + id: '/sec-e' + path: '/sec-e' + fullPath: '/sec-e' + preLoaderRoute: typeof SecERouteImport + parentRoute: typeof rootRouteImport } - '/sec-b/': { - id: '/sec-b/' - path: '/' - fullPath: '/sec-b/' - preLoaderRoute: typeof SecBIndexRouteImport - parentRoute: typeof SecBRoute + '/sec-f': { + id: '/sec-f' + path: '/sec-f' + fullPath: '/sec-f' + preLoaderRoute: typeof SecFRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/pricing': { + id: '/(marketing)/pricing' + path: '/pricing' + fullPath: '/pricing' + preLoaderRoute: typeof marketingPricingRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/promo': { + id: '/(marketing)/promo' + path: '/promo' + fullPath: '/promo' + preLoaderRoute: typeof marketingPromoRouteImport + parentRoute: typeof rootRouteImport + } + '/_layout/alpha': { + id: '/_layout/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof LayoutAlphaRouteImport + parentRoute: typeof LayoutRoute + } + '/_layout/beta': { + id: '/_layout/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof LayoutBetaRouteImport + parentRoute: typeof LayoutRoute + } + '/files/$': { + id: '/files/$' + path: '/files/$' + fullPath: '/files/$' + preLoaderRoute: typeof FilesSplatRouteImport + parentRoute: typeof rootRouteImport + } + '/release/v{$version}': { + id: '/release/v{$version}' + path: '/release/v{$version}' + fullPath: '/release/v{$version}' + preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport + parentRoute: typeof rootRouteImport } '/sec-a/': { id: '/sec-a/' @@ -582,125 +589,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecAIndexRouteImport parentRoute: typeof SecARoute } - '/sec-f/settings': { - id: '/sec-f/settings' - path: '/settings' - fullPath: '/sec-f/settings' - preLoaderRoute: typeof SecFSettingsRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/about': { - id: '/sec-f/about' - path: '/about' - fullPath: '/sec-f/about' - preLoaderRoute: typeof SecFAboutRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/$id': { - id: '/sec-f/$id' - path: '/$id' - fullPath: '/sec-f/$id' - preLoaderRoute: typeof SecFIdRouteImport - parentRoute: typeof SecFRoute - } - '/sec-e/settings': { - id: '/sec-e/settings' - path: '/settings' - fullPath: '/sec-e/settings' - preLoaderRoute: typeof SecESettingsRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/about': { - id: '/sec-e/about' - path: '/about' - fullPath: '/sec-e/about' - preLoaderRoute: typeof SecEAboutRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/$id': { - id: '/sec-e/$id' - path: '/$id' - fullPath: '/sec-e/$id' - preLoaderRoute: typeof SecEIdRouteImport - parentRoute: typeof SecERoute - } - '/sec-d/settings': { - id: '/sec-d/settings' - path: '/settings' - fullPath: '/sec-d/settings' - preLoaderRoute: typeof SecDSettingsRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/about': { - id: '/sec-d/about' - path: '/about' - fullPath: '/sec-d/about' - preLoaderRoute: typeof SecDAboutRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/$id': { - id: '/sec-d/$id' - path: '/$id' - fullPath: '/sec-d/$id' - preLoaderRoute: typeof SecDIdRouteImport - parentRoute: typeof SecDRoute - } - '/sec-c/settings': { - id: '/sec-c/settings' - path: '/settings' - fullPath: '/sec-c/settings' - preLoaderRoute: typeof SecCSettingsRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/about': { - id: '/sec-c/about' - path: '/about' - fullPath: '/sec-c/about' - preLoaderRoute: typeof SecCAboutRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/$id': { - id: '/sec-c/$id' - path: '/$id' - fullPath: '/sec-c/$id' - preLoaderRoute: typeof SecCIdRouteImport - parentRoute: typeof SecCRoute - } - '/sec-b/settings': { - id: '/sec-b/settings' - path: '/settings' - fullPath: '/sec-b/settings' - preLoaderRoute: typeof SecBSettingsRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/about': { - id: '/sec-b/about' - path: '/about' - fullPath: '/sec-b/about' - preLoaderRoute: typeof SecBAboutRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/$id': { - id: '/sec-b/$id' - path: '/$id' - fullPath: '/sec-b/$id' - preLoaderRoute: typeof SecBIdRouteImport - parentRoute: typeof SecBRoute - } - '/sec-a/settings': { - id: '/sec-a/settings' - path: '/settings' - fullPath: '/sec-a/settings' - preLoaderRoute: typeof SecASettingsRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/about': { - id: '/sec-a/about' - path: '/about' - fullPath: '/sec-a/about' - preLoaderRoute: typeof SecAAboutRouteImport - parentRoute: typeof SecARoute - } '/sec-a/$id': { id: '/sec-a/$id' path: '/$id' @@ -708,47 +596,159 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecAIdRouteImport parentRoute: typeof SecARoute } - '/release/v{$version}': { - id: '/release/v{$version}' - path: '/release/v{$version}' - fullPath: '/release/v{$version}' - preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport - parentRoute: typeof rootRouteImport + '/sec-a/about': { + id: '/sec-a/about' + path: '/about' + fullPath: '/sec-a/about' + preLoaderRoute: typeof SecAAboutRouteImport + parentRoute: typeof SecARoute } - '/files/$': { - id: '/files/$' - path: '/files/$' - fullPath: '/files/$' - preLoaderRoute: typeof FilesSplatRouteImport - parentRoute: typeof rootRouteImport + '/sec-a/settings': { + id: '/sec-a/settings' + path: '/settings' + fullPath: '/sec-a/settings' + preLoaderRoute: typeof SecASettingsRouteImport + parentRoute: typeof SecARoute } - '/_layout/beta': { - id: '/_layout/beta' - path: '/beta' - fullPath: '/beta' - preLoaderRoute: typeof LayoutBetaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/': { + id: '/sec-b/' + path: '/' + fullPath: '/sec-b/' + preLoaderRoute: typeof SecBIndexRouteImport + parentRoute: typeof SecBRoute } - '/_layout/alpha': { - id: '/_layout/alpha' - path: '/alpha' - fullPath: '/alpha' - preLoaderRoute: typeof LayoutAlphaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/$id': { + id: '/sec-b/$id' + path: '/$id' + fullPath: '/sec-b/$id' + preLoaderRoute: typeof SecBIdRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/promo': { - id: '/(marketing)/promo' - path: '/promo' - fullPath: '/promo' - preLoaderRoute: typeof marketingPromoRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/about': { + id: '/sec-b/about' + path: '/about' + fullPath: '/sec-b/about' + preLoaderRoute: typeof SecBAboutRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/pricing': { - id: '/(marketing)/pricing' - path: '/pricing' - fullPath: '/pricing' - preLoaderRoute: typeof marketingPricingRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/settings': { + id: '/sec-b/settings' + path: '/settings' + fullPath: '/sec-b/settings' + preLoaderRoute: typeof SecBSettingsRouteImport + parentRoute: typeof SecBRoute + } + '/sec-c/': { + id: '/sec-c/' + path: '/' + fullPath: '/sec-c/' + preLoaderRoute: typeof SecCIndexRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/$id': { + id: '/sec-c/$id' + path: '/$id' + fullPath: '/sec-c/$id' + preLoaderRoute: typeof SecCIdRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/about': { + id: '/sec-c/about' + path: '/about' + fullPath: '/sec-c/about' + preLoaderRoute: typeof SecCAboutRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/settings': { + id: '/sec-c/settings' + path: '/settings' + fullPath: '/sec-c/settings' + preLoaderRoute: typeof SecCSettingsRouteImport + parentRoute: typeof SecCRoute + } + '/sec-d/': { + id: '/sec-d/' + path: '/' + fullPath: '/sec-d/' + preLoaderRoute: typeof SecDIndexRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/$id': { + id: '/sec-d/$id' + path: '/$id' + fullPath: '/sec-d/$id' + preLoaderRoute: typeof SecDIdRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/about': { + id: '/sec-d/about' + path: '/about' + fullPath: '/sec-d/about' + preLoaderRoute: typeof SecDAboutRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/settings': { + id: '/sec-d/settings' + path: '/settings' + fullPath: '/sec-d/settings' + preLoaderRoute: typeof SecDSettingsRouteImport + parentRoute: typeof SecDRoute + } + '/sec-e/': { + id: '/sec-e/' + path: '/' + fullPath: '/sec-e/' + preLoaderRoute: typeof SecEIndexRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/$id': { + id: '/sec-e/$id' + path: '/$id' + fullPath: '/sec-e/$id' + preLoaderRoute: typeof SecEIdRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/about': { + id: '/sec-e/about' + path: '/about' + fullPath: '/sec-e/about' + preLoaderRoute: typeof SecEAboutRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/settings': { + id: '/sec-e/settings' + path: '/settings' + fullPath: '/sec-e/settings' + preLoaderRoute: typeof SecESettingsRouteImport + parentRoute: typeof SecERoute + } + '/sec-f/': { + id: '/sec-f/' + path: '/' + fullPath: '/sec-f/' + preLoaderRoute: typeof SecFIndexRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/$id': { + id: '/sec-f/$id' + path: '/$id' + fullPath: '/sec-f/$id' + preLoaderRoute: typeof SecFIdRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/about': { + id: '/sec-f/about' + path: '/about' + fullPath: '/sec-f/about' + preLoaderRoute: typeof SecFAboutRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/settings': { + id: '/sec-f/settings' + path: '/settings' + fullPath: '/sec-f/settings' + preLoaderRoute: typeof SecFSettingsRouteImport + parentRoute: typeof SecFRoute } } } diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts index 9365231579..331e8e008f 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts index 5bdd994e32..0b38f7bddb 100644 --- a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts index ea0baa1098..caa626c596 100644 --- a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts index 96d211d64c..b15beed09b 100644 --- a/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts @@ -9,13 +9,13 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as ProductsRouteImport } from './routes/products' -import { Route as CatalogRouteImport } from './routes/catalog' import { Route as IndexRouteImport } from './routes/index' +import { Route as CatalogRouteImport } from './routes/catalog' +import { Route as ProductsRouteImport } from './routes/products' -const ProductsRoute = ProductsRouteImport.update({ - id: '/products', - path: '/products', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const CatalogRoute = CatalogRouteImport.update({ @@ -23,9 +23,9 @@ const CatalogRoute = CatalogRouteImport.update({ path: '/catalog', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const ProductsRoute = ProductsRouteImport.update({ + id: '/products', + path: '/products', getParentRoute: () => rootRouteImport, } as any) @@ -61,11 +61,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/products': { - id: '/products' - path: '/products' - fullPath: '/products' - preLoaderRoute: typeof ProductsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/catalog': { @@ -75,11 +75,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof CatalogRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/products': { + id: '/products' + path: '/products' + fullPath: '/products' + preLoaderRoute: typeof ProductsRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts index c82efd49c9..728d2779e8 100644 --- a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/solid/speed.bench.ts b/benchmarks/client-nav/solid/speed.bench.ts index 34791180ce..d629da17a8 100644 --- a/benchmarks/client-nav/solid/speed.bench.ts +++ b/benchmarks/client-nav/solid/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (solid)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/solid/vite.config.ts b/benchmarks/client-nav/solid/vite.config.ts index 1dd8e1e15c..0c26b32f5f 100644 --- a/benchmarks/client-nav/solid/vite.config.ts +++ b/benchmarks/client-nav/solid/vite.config.ts @@ -37,6 +37,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['solid/speed.bench.ts'] }, server: { deps: { inline: [/@solidjs/, /@tanstack\/solid-store/], diff --git a/benchmarks/client-nav/vue/speed.bench.ts b/benchmarks/client-nav/vue/speed.bench.ts index f9e532f5ba..503e91e7b7 100644 --- a/benchmarks/client-nav/vue/speed.bench.ts +++ b/benchmarks/client-nav/vue/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (vue)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/vue/vite.config.ts b/benchmarks/client-nav/vue/vite.config.ts index 7abe24b455..78d8ae5638 100644 --- a/benchmarks/client-nav/vue/vite.config.ts +++ b/benchmarks/client-nav/vue/vite.config.ts @@ -36,5 +36,6 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['vue/speed.bench.ts'] }, }, }) diff --git a/benchmarks/cpu-simulation.ts b/benchmarks/cpu-simulation.ts index 7e16bf4c5a..9b8859f74d 100644 --- a/benchmarks/cpu-simulation.ts +++ b/benchmarks/cpu-simulation.ts @@ -1,9 +1,23 @@ +function codspeedRunnerMode() { + return process.env.CODSPEED_ENV === undefined + ? undefined + : process.env.CODSPEED_RUNNER_MODE +} + +/** + * Whether CodSpeed's simulation or memory instrument drives the run. Both + * measure one invocation after a few warmup calls instead of sampling. + */ +export function isCodSpeedAnalysis() { + const mode = codspeedRunnerMode() + return ( + mode === 'simulation' || mode === 'instrumentation' || mode === 'memory' + ) +} + /** Extra worker flags for CodSpeed CPU simulation, not walltime benchmarks. */ export function cpuSimulationExecArgv() { - const mode = - process.env.CODSPEED_ENV === undefined - ? undefined - : process.env.CODSPEED_RUNNER_MODE + const mode = codspeedRunnerMode() if (mode === 'simulation' || mode === 'instrumentation') { // CodSpeed supplies --no-opt, which only disables TurboFan on Node 24. // Maglev can still compile and inline hot functions between measured runs. @@ -22,3 +36,18 @@ export function cpuSimulationExecArgv() { } return [] } + +/** + * Per-bench lifecycle for apps that a bench prepares and disposes outside + * timing. CodSpeed measures one invocation, so each invocation gets fresh + * state. Tinybench samples thousands of iterations and keeps one instance per + * warmup/run phase instead of preparing it for every iteration. + */ +export function benchLifecycle(hooks: { + before: () => Promise | void + after: () => Promise | void +}) { + return isCodSpeedAnalysis() + ? { beforeEach: hooks.before, afterEach: hooks.after } + : { beforeAll: hooks.before, afterAll: hooks.after } +} diff --git a/benchmarks/memory/README.md b/benchmarks/memory/README.md index d93e77e70b..18b68768f9 100644 --- a/benchmarks/memory/README.md +++ b/benchmarks/memory/README.md @@ -2,7 +2,7 @@ Dedicated memory benchmarks for TanStack Router / Start, measured with the CodSpeed **memory instrument** (`mode: memory` in -`.github/workflows/client-nav-benchmarks.yml`). The workflow runs on every +`.github/workflows/benchmarks.yml`). The workflow runs on every push to `main` except docs/examples/e2e-only pushes: CodSpeed compares a PR against the run on its merge-base commit, and a main commit without a run makes CodSpeed silently fall back to an older base — a single outlier base run then @@ -34,8 +34,8 @@ benchmarks/memory// One app per scenario; apps and bench names are stable once landed (CodSpeed continuity). Never grow an existing scenario for a new case — add a scenario. `setup.ts` imports the built app and exports the concrete workload; -`memory.bench.ts` registers `bench(...)` directly, and `memory.flame.ts` runs the -same workload through the Flame profiler. +`memory.bench.ts` registers it with Vitest's `bench` test fixture, and +`memory.flame.ts` runs the same workload through the Flame profiler. ## How the memory instrument executes a bench @@ -43,19 +43,21 @@ same workload through the Flame profiler. after a forced GC. Under plain `vitest bench` the suites only smoke-test: timing output is meaningless; real numbers come from CodSpeed. - Under CodSpeed the bench fn runs several warmup invocations plus the - measured one. Client suite hooks mount a fresh app before each invocation - and tear it down afterward, outside the measurement window. This prevents - warmup navigation history and caches from changing the starting state. - Module-level counters/LCGs keep generated URLs unique across invocations. -- Plain `vitest bench` never runs suite hooks (`beforeEach`/`afterEach`) and - only honors tinybench's `setup`/`teardown` options; the CodSpeed runner - does the exact opposite. Client benches therefore register **both** — in - any given mode exactly one pair runs. + measured one. The bench's `beforeEach`/`afterEach` hooks + (`memoryBenchHooks`) run around every invocation, outside the measurement + window: client workloads mount a fresh app before each invocation and tear + it down afterward. This prevents warmup navigation history and caches from + changing the starting state. Plain `vitest bench` runs the same hooks around + its warmup and measured iteration. Module-level counters/LCGs keep generated + URLs unique across invocations. +- Workload `run` functions must be `async` functions. CodSpeed's Vitest 5 + provider awaits only `AsyncFunction`s; a plain function that returns a + promise would be measured only up to its first suspension. - Worker flags live in `runtime.ts` and apply only to the CodSpeed memory instrument. They supplement the integration's predictable execution flags; the retained overrides are described below. -- Before each CodSpeed invocation, a setup hook yields to the event loop, - outside the measurement marker and before CodSpeed forces GC. Promise-only +- Before each CodSpeed invocation, the `beforeEach` hook yields to the event + loop, outside the measurement marker and before CodSpeed forces GC. Promise-only warmup chains can keep WeakRef targets alive through a collection in the same job. Client app setup also runs before the forced GC. - Do not force GC inside a measured request loop or poll `heapUsed` to choose @@ -72,13 +74,14 @@ same workload through the Flame profiler. All scenarios use [`memoryConfig`](./runtime.ts). It adds these flags only in memory mode: +- `--no-maglev` - `--no-flush-bytecode` - `--no-minor-gc-task` - `--no-incremental-marking` - `--initial-old-space-size=512` `--jitless` was removed after repeated CI comparisons. Ten unchanged-commit -repetitions with these four flags kept all 48 peak-memory results within 1% +repetitions with the last four flags kept all 48 peak-memory results within 1% (worst spread: 0.834%). With JIT enabled, all 16 subsets of the four flags were tested. Removing bytecode, minor-GC-task, incremental-marking, or heap-budget overrides from this profile produced worst client peak spreads of 6.616%, 2.714%, @@ -101,6 +104,19 @@ collections. This does not preallocate 512 MiB, and the smallest sufficient budg was not determined. Results describe this controlled worker profile, not a production application's absolute memory footprint. +CodSpeed's `--no-opt` only disables TurboFan on Node 24 (V8 13); Maglev still +compiles. Under CodSpeed's `--predictable` there is no background compilation, +so Maglev compiles run synchronously inside whichever request triggers them, and +the forced GC before the measured call can discard optimized code so recompiles +land inside the measured window. Maglev's malloc'd Zone scratch (32 KiB +segments) then dominates allocation metrics, and its size depends on +per-process feedback state. `--no-maglev` was added for this: the bimodal ++32,792 B / +1 allocation in `mem server error-paths unmatched (react)` was one +Maglev Zone segment allocated while compiling React Fizz's per-request stream +`write` closure, and compiler scratch made up ~97% of that bench's allocated +bytes. Retained-object measurements are unaffected because Zone memory is freed +after each compile. The repeatability figures above predate this flag. + ## Bench shapes and signals - **Churn:** a fixed number of sequential operations, measuring native @@ -242,7 +258,7 @@ WITH_INSTRUMENTATION=1 codspeed run --mode memory -- pnpm nx run @benchmarks/mem Run the benchmark workflow on an experiment branch: ```bash -gh workflow run client-nav-benchmarks.yml --ref +gh workflow run benchmarks.yml --ref ``` Repeat at the same commit, using distinct branch names if runs should overlap diff --git a/benchmarks/memory/client/bench-utils.ts b/benchmarks/memory/client/bench-utils.ts index 0cbaedbd71..785e8fac7f 100644 --- a/benchmarks/memory/client/bench-utils.ts +++ b/benchmarks/memory/client/bench-utils.ts @@ -1,3 +1,5 @@ +export { memoryBenchHooks } from '../turn' + export const memoryBenchOptions = { iterations: 1, warmupIterations: 1, diff --git a/benchmarks/memory/client/benchmark.ts b/benchmarks/memory/client/benchmark.ts index 8b877b0740..463047f4d9 100644 --- a/benchmarks/memory/client/benchmark.ts +++ b/benchmarks/memory/client/benchmark.ts @@ -1,6 +1,10 @@ export interface ClientMemoryWorkload { name: string before?: () => Promise | void + /** + * Must be an `async` function: CodSpeed's Vitest 5 provider awaits only + * `AsyncFunction`s and otherwise measures just the synchronous part. + */ run: () => Promise | void sanity: () => Promise | void after?: () => Promise | void diff --git a/benchmarks/memory/client/package.json b/benchmarks/memory/client/package.json index 2da6cb4ad8..4dc6246183 100644 --- a/benchmarks/memory/client/package.json +++ b/benchmarks/memory/client/package.json @@ -22,7 +22,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@testing-library/react": "^16.2.0", @@ -202,7 +202,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -214,7 +214,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -226,7 +226,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/memory/client" } }, diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/vitest.setup.ts b/benchmarks/memory/client/vitest.setup.ts index 5f78f1a7d1..ce3127275a 100644 --- a/benchmarks/memory/client/vitest.setup.ts +++ b/benchmarks/memory/client/vitest.setup.ts @@ -1,6 +1,3 @@ -import { beforeEach } from 'vitest' -import { endMemoryTurn, isMemoryInstrumented } from '../turn' - // @ts-expect-error global.IS_REACT_ACT_ENVIRONMENT = true @@ -10,7 +7,3 @@ window.scrollTo = scrollTo globalThis.scrollTo = scrollTo export {} - -if (isMemoryInstrumented()) { - beforeEach(endMemoryTurn) -} diff --git a/benchmarks/memory/runtime.ts b/benchmarks/memory/runtime.ts index 2aded74582..010149b4df 100644 --- a/benchmarks/memory/runtime.ts +++ b/benchmarks/memory/runtime.ts @@ -7,9 +7,16 @@ export function memoryExecArgv() { return [] } + // CodSpeed supplies --no-opt, which only disables TurboFan on Node 24. + // Under --predictable, Maglev compilations run synchronously inside the + // request that triggers them, and the forced GC before the measured call can + // discard optimized code so recompiles land in the measured window. Their + // malloc'd Zone scratch (32 KiB segments) then dominates allocation metrics + // and depends on per-process feedback state. // Limit variation from GC scheduling and bytecode reclamation; keep a // fixed initial old-generation budget. return [ + '--no-maglev', '--no-flush-bytecode', '--no-minor-gc-task', '--no-incremental-marking', @@ -22,8 +29,8 @@ export function memoryConfig(side: 'client' | 'server') { return { execArgv, setupFiles: - side === 'client' || isMemoryInstrumented() - ? [fileURLToPath(new URL(`./${side}/vitest.setup.ts`, import.meta.url))] + side === 'client' + ? [fileURLToPath(new URL('./client/vitest.setup.ts', import.meta.url))] : [], } } diff --git a/benchmarks/memory/server/bench-utils.ts b/benchmarks/memory/server/bench-utils.ts index 8893d5be4b..9caaf63384 100644 --- a/benchmarks/memory/server/bench-utils.ts +++ b/benchmarks/memory/server/bench-utils.ts @@ -1,3 +1,5 @@ +export { memoryBenchHooks } from '../turn' + export interface StartRequestHandler { fetch: (request: Request) => Promise | Response } diff --git a/benchmarks/memory/server/benchmark.ts b/benchmarks/memory/server/benchmark.ts index 301a9f956d..9b8dc2c76f 100644 --- a/benchmarks/memory/server/benchmark.ts +++ b/benchmarks/memory/server/benchmark.ts @@ -1,5 +1,9 @@ export interface ServerMemoryWorkload { name: string + /** + * Must be an `async` function: CodSpeed's Vitest 5 provider awaits only + * `AsyncFunction`s and otherwise measures just the synchronous part. + */ run: () => Promise | void } diff --git a/benchmarks/memory/server/package.json b/benchmarks/memory/server/package.json index 5d59987e68..d09343c7b6 100644 --- a/benchmarks/memory/server/package.json +++ b/benchmarks/memory/server/package.json @@ -23,7 +23,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@vitejs/plugin-react": "^6.0.1", @@ -208,7 +208,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -220,7 +220,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -232,7 +232,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/memory/server" } }, diff --git a/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts index b5a61594ba..29eca99e00 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts @@ -221,7 +221,7 @@ export function createWorkloadGroup( handler: StartRequestHandler, ) { const mode = abortedRequestModes[framework] - const run = () => runAbortedRequestLoop(handler, mode) + const run = async () => runAbortedRequestLoop(handler, mode) return { sanity: () => assertAbortedRequestsSanity(handler, mode), diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/shared.ts b/benchmarks/memory/server/scenarios/error-paths/shared.ts index 966505f3a0..11ed293d22 100644 --- a/benchmarks/memory/server/scenarios/error-paths/shared.ts +++ b/benchmarks/memory/server/scenarios/error-paths/shared.ts @@ -136,7 +136,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const runRedirect = () => + const runRedirect = async () => runSequentialRequestLoop(handler, { random: redirectRandom, iterations: errorPathsIterations, @@ -144,7 +144,7 @@ export function createWorkloadGroup( validateResponse: validateRedirectResponse, }) - const runNotFound = () => + const runNotFound = async () => runSequentialRequestLoop(handler, { random: notFoundRandom, iterations: errorPathsIterations, @@ -152,7 +152,7 @@ export function createWorkloadGroup( validateResponse: validateNotFoundResponse, }) - const runError = () => + const runError = async () => runSequentialRequestLoop(handler, { random: errorRandom, iterations: errorPathsIterations, @@ -160,7 +160,7 @@ export function createWorkloadGroup( validateResponse: validateErrorResponse, }) - const runUnmatched = () => + const runUnmatched = async () => runSequentialRequestLoop(handler, { random: unmatchedRandom, iterations: errorPathsIterations, diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts index 486c025f5a..085e576244 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts @@ -48,7 +48,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: peakLargePageIterations, diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/shared.ts b/benchmarks/memory/server/scenarios/request-churn/shared.ts index 32125148cd..b200c96ed6 100644 --- a/benchmarks/memory/server/scenarios/request-churn/shared.ts +++ b/benchmarks/memory/server/scenarios/request-churn/shared.ts @@ -62,7 +62,7 @@ export function createWorkloadGroup( return new Request(`http://localhost/items/${id}?q=${q}`, requestInit) } - const run = () => + const run = async () => runSequentialRequestLoop(handler, { random: benchmarkRandom, iterations: requestChurnIterations, diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts index 7f40aeb9d2..14ec8f7e0a 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts @@ -55,7 +55,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: serializationPayloadIterations, diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts index 5fd1e22632..167b24d3b6 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts @@ -202,7 +202,7 @@ export async function createWorkloadGroup( handler: StartRequestHandler, ) { const urls = await discoverUrls(handler) - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: serverFnChurnIterations, diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts index 01917c4743..c027047408 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts @@ -92,7 +92,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: streamingPeakIterations, diff --git a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/vitest.setup.ts b/benchmarks/memory/server/vitest.setup.ts deleted file mode 100644 index be96c0067a..0000000000 --- a/benchmarks/memory/server/vitest.setup.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { beforeEach } from 'vitest' -import { endMemoryTurn } from '../turn' - -beforeEach(endMemoryTurn) diff --git a/benchmarks/memory/turn.ts b/benchmarks/memory/turn.ts index 3ee6d53833..08729685fe 100644 --- a/benchmarks/memory/turn.ts +++ b/benchmarks/memory/turn.ts @@ -10,3 +10,25 @@ export function isMemoryInstrumented() { export function endMemoryTurn() { return new Promise((resolve) => setImmediate(resolve)) } + +/** + * Per-invocation bench hooks. CodSpeed runs them around every warmup + * invocation and the measured one, outside the measurement marker: the turn + * ends first, then the workload prepares fresh state before the forced GC. + */ +export function memoryBenchHooks( + workload: { + before?: () => Promise | void + after?: () => Promise | void + } = {}, +) { + return { + async beforeEach() { + if (isMemoryInstrumented()) { + await endMemoryTurn() + } + await workload.before?.() + }, + afterEach: workload.after, + } +} diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index a6ab62efa5..20c1837468 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -15,7 +15,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.5", "@types/react": "catalog:", @@ -116,7 +116,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench", + "command": "NODE_ENV=production vitest bench --mode benchmark", "cwd": "benchmarks/ssr" } }, @@ -134,7 +134,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/ssr" } }, @@ -145,7 +145,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/ssr" } }, @@ -156,7 +156,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/ssr" } }, diff --git a/benchmarks/ssr/react/speed.bench.ts b/benchmarks/ssr/react/speed.bench.ts index 419b1ccb36..6825a7ddfb 100644 --- a/benchmarks/ssr/react/speed.bench.ts +++ b/benchmarks/ssr/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (react)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (react)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts index 6413559b92..0496613afb 100644 --- a/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (react)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (react)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts index 5970b88f0b..7dc57d89f1 100644 --- a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (react)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (react)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts index 63fa209ac3..d159124a04 100644 --- a/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (solid)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (solid)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts index fb5631a50e..47f483df11 100644 --- a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (solid)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (solid)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts index ae8712da75..e56d41df6b 100644 --- a/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (vue)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (vue)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts index 5225e3dc66..3f77a0dcc1 100644 --- a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (vue)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (vue)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts index 09073687c0..8a4355a168 100644 --- a/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (react)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (react)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts index 5f6e8baf8a..27e0d3a64c 100644 --- a/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (solid)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (solid)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts index d2cfd6814b..8684c159eb 100644 --- a/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (vue)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (vue)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts index 3c0a3f502e..899f400799 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (react)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (react)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts index 3e117895d8..0a93c5eac3 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (react)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (react)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts index 566748735e..53e09fd34e 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (react)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (react)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts index b7c25a0bb2..1cd7c1044c 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (react)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (react)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts index e56335c602..1e8abfd318 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (react)', - () => runNotFoundLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr not-found (react)', async () => + runNotFoundLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts index b76cd741df..904b693e25 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (solid)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (solid)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts index 119f65c9ee..57a2f0fbe9 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (solid)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (solid)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts index 8954e67986..6581e92b39 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (solid)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (solid)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts index d59282def9..40f1679320 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (solid)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (solid)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts index 66cf63fe79..efcb7cc229 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (solid)', - () => runNotFoundLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr not-found (solid)', async () => + runNotFoundLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts index 5e7342c172..3cec17d9c8 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts @@ -10,30 +10,20 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as TargetIdRouteImport } from './routes/target.$id' -import { Route as MissingIdRouteImport } from './routes/missing.$id' -import { Route as HeadersIdRouteImport } from './routes/headers.$id' -import { Route as FromIdRouteImport } from './routes/from.$id' import { Route as BoomIdRouteImport } from './routes/boom.$id' +import { Route as FromIdRouteImport } from './routes/from.$id' +import { Route as HeadersIdRouteImport } from './routes/headers.$id' +import { Route as MissingIdRouteImport } from './routes/missing.$id' +import { Route as TargetIdRouteImport } from './routes/target.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const TargetIdRoute = TargetIdRouteImport.update({ - id: '/target/$id', - path: '/target/$id', - getParentRoute: () => rootRouteImport, -} as any) -const MissingIdRoute = MissingIdRouteImport.update({ - id: '/missing/$id', - path: '/missing/$id', - getParentRoute: () => rootRouteImport, -} as any) -const HeadersIdRoute = HeadersIdRouteImport.update({ - id: '/headers/$id', - path: '/headers/$id', +const BoomIdRoute = BoomIdRouteImport.update({ + id: '/boom/$id', + path: '/boom/$id', getParentRoute: () => rootRouteImport, } as any) const FromIdRoute = FromIdRouteImport.update({ @@ -41,9 +31,19 @@ const FromIdRoute = FromIdRouteImport.update({ path: '/from/$id', getParentRoute: () => rootRouteImport, } as any) -const BoomIdRoute = BoomIdRouteImport.update({ - id: '/boom/$id', - path: '/boom/$id', +const HeadersIdRoute = HeadersIdRouteImport.update({ + id: '/headers/$id', + path: '/headers/$id', + getParentRoute: () => rootRouteImport, +} as any) +const MissingIdRoute = MissingIdRouteImport.update({ + id: '/missing/$id', + path: '/missing/$id', + getParentRoute: () => rootRouteImport, +} as any) +const TargetIdRoute = TargetIdRouteImport.update({ + id: '/target/$id', + path: '/target/$id', getParentRoute: () => rootRouteImport, } as any) @@ -117,25 +117,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/target/$id': { - id: '/target/$id' - path: '/target/$id' - fullPath: '/target/$id' - preLoaderRoute: typeof TargetIdRouteImport - parentRoute: typeof rootRouteImport - } - '/missing/$id': { - id: '/missing/$id' - path: '/missing/$id' - fullPath: '/missing/$id' - preLoaderRoute: typeof MissingIdRouteImport - parentRoute: typeof rootRouteImport - } - '/headers/$id': { - id: '/headers/$id' - path: '/headers/$id' - fullPath: '/headers/$id' - preLoaderRoute: typeof HeadersIdRouteImport + '/boom/$id': { + id: '/boom/$id' + path: '/boom/$id' + fullPath: '/boom/$id' + preLoaderRoute: typeof BoomIdRouteImport parentRoute: typeof rootRouteImport } '/from/$id': { @@ -145,11 +131,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof FromIdRouteImport parentRoute: typeof rootRouteImport } - '/boom/$id': { - id: '/boom/$id' - path: '/boom/$id' - fullPath: '/boom/$id' - preLoaderRoute: typeof BoomIdRouteImport + '/headers/$id': { + id: '/headers/$id' + path: '/headers/$id' + fullPath: '/headers/$id' + preLoaderRoute: typeof HeadersIdRouteImport + parentRoute: typeof rootRouteImport + } + '/missing/$id': { + id: '/missing/$id' + path: '/missing/$id' + fullPath: '/missing/$id' + preLoaderRoute: typeof MissingIdRouteImport + parentRoute: typeof rootRouteImport + } + '/target/$id': { + id: '/target/$id' + path: '/target/$id' + fullPath: '/target/$id' + preLoaderRoute: typeof TargetIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts index e57ec26b52..0b95f426f2 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (vue)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (vue)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts index e118e1dd28..262ca951af 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (vue)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (vue)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts index 0bef524eaf..bf8c90a8a1 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (vue)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (vue)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts index e29919dc56..d7f8ebeb9e 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (vue)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (vue)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts index b2ab3af3c7..4b84fb594c 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (vue)', - () => runNotFoundLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr not-found (vue)', async () => runNotFoundLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts index c68d718262..cb3f9f427c 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (react)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (react)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts index 2655ef2f49..48c444de77 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (react)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (react)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts index 2a784ec987..22f53883ee 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts index 64e18cfe61..f01b48d66e 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts index 4418f0867e..b01957f806 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts index 189f3b7ef6..08d97fcaf6 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts index 5f27210e36..0e5f504090 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (solid)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (solid)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts index eb19e10ec9..915507ef9f 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (solid)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (solid)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts index c7485b4ef4..a791145935 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts index ac18e0ca79..1baab0f344 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts index 7c2be97b01..d6fde20764 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts index 7d21d72067..558ebeb9a4 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts index 28d816525e..65f7fa5848 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts @@ -10,8 +10,8 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiPingIdRouteImport } from './routes/api.ping.$id' const IndexRoute = IndexRouteImport.update({ @@ -19,16 +19,16 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) -const PageIdRoute = PageIdRouteImport.update({ - id: '/page/$id', - path: '/page/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const PageIdRoute = PageIdRouteImport.update({ + id: '/page/$id', + path: '/page/$id', + getParentRoute: () => rootRouteImport, +} as any) const ApiPingIdRoute = ApiPingIdRouteImport.update({ id: '/api/ping/$id', path: '/api/ping/$id', @@ -78,13 +78,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/page/$id': { - id: '/page/$id' - path: '/page/$id' - fullPath: '/page/$id' - preLoaderRoute: typeof PageIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -92,6 +85,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/page/$id': { + id: '/page/$id' + path: '/page/$id' + fullPath: '/page/$id' + preLoaderRoute: typeof PageIdRouteImport + parentRoute: typeof rootRouteImport + } '/api/ping/$id': { id: '/api/ping/$id' path: '/api/ping/$id' diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts index 5d92aab849..9660f29d07 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (vue)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (vue)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts index ab158504c8..297e8cee7b 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (vue)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (vue)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts index c334af8b65..d023dd458a 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts index 7c1b91a0ea..5018163631 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts index 5b00bd3ca9..f9abd8eb60 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts index 6cdc34241e..adcec3019f 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/head/react/speed.bench.ts b/benchmarks/ssr/scenarios/head/react/speed.bench.ts index 19158b32a9..f75008506e 100644 --- a/benchmarks/ssr/scenarios/head/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (react)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (react)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts index ad5bf52809..333e2f091b 100644 --- a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (solid)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (solid)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts index 5d8243b588..936735a909 100644 --- a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (vue)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (vue)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts index a5eecfc648..7acd43c635 100644 --- a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (react)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (react)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts index 7b3f6247ea..7fc8d88389 100644 --- a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (solid)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (solid)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts index fb39e0652c..321350d98c 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (vue)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (vue)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts index a8af260279..920186c5db 100644 --- a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (react)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (react)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts index cffabcafb5..f5d09089a6 100644 --- a/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (react)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (react)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts index 5fdef077c9..488fb2ca52 100644 --- a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (solid)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (solid)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts index 2458a59b69..7b86e2ba11 100644 --- a/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (solid)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (solid)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts index b8a98c3408..5fd4da9d3e 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (vue)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (vue)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts index e011a9fc8d..f3664b5f21 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (vue)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (vue)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts index e0e8a0e3c4..ba6bd4a61d 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (react)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (react)', async () => + runSelectiveLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts index 6a2803d45f..76265397ab 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (solid)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (solid)', async () => + runSelectiveLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts index f3082a102d..ff60341b27 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (vue)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (vue)', async () => runSelectiveLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts index 9032280e51..8be07d2643 100644 --- a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (react)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (react)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts index a6c8d99fb6..c70fddc6c4 100644 --- a/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (react)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (react)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts index 3fa22ccea9..70bda8c7af 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (solid)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (solid)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts index 354512e09d..d7ccb16f6f 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (solid)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (solid)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts index 69b63cffe9..b9e25f918e 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts @@ -9,19 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as RichIdRouteImport } from './routes/rich.$id' import { Route as PlainIdRouteImport } from './routes/plain.$id' +import { Route as RichIdRouteImport } from './routes/rich.$id' -const RichIdRoute = RichIdRouteImport.update({ - id: '/rich/$id', - path: '/rich/$id', - getParentRoute: () => rootRouteImport, -} as any) const PlainIdRoute = PlainIdRouteImport.update({ id: '/plain/$id', path: '/plain/$id', getParentRoute: () => rootRouteImport, } as any) +const RichIdRoute = RichIdRouteImport.update({ + id: '/rich/$id', + path: '/rich/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/plain/$id': typeof PlainIdRoute @@ -51,13 +51,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/rich/$id': { - id: '/rich/$id' - path: '/rich/$id' - fullPath: '/rich/$id' - preLoaderRoute: typeof RichIdRouteImport - parentRoute: typeof rootRouteImport - } '/plain/$id': { id: '/plain/$id' path: '/plain/$id' @@ -65,6 +58,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PlainIdRouteImport parentRoute: typeof rootRouteImport } + '/rich/$id': { + id: '/rich/$id' + path: '/rich/$id' + fullPath: '/rich/$id' + preLoaderRoute: typeof RichIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts index d68c615fdc..7f733dd601 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (vue)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (vue)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts index 875a858226..8efdeb6c79 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (vue)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (vue)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts index 149ff591ed..fa80cdb690 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (react)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (react)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts index 43b31c609d..fd535ee313 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (react)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (react)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts index 4c90ffb847..8fbce405dd 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (react)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (react)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts index aaa2028902..adac07cb22 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (solid)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (solid)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts index 661430c3ae..843a4c97ce 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (solid)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (solid)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts index 37d9b86e12..aa24d55e79 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (solid)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (solid)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts index 99d266298d..24305cf1bc 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (vue)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (vue)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts index 36e1b9ed22..2eeb9a4f6b 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (vue)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (vue)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts index 4c9e5dc752..a73905004d 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (vue)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (vue)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts index 697bfe967a..c876772ad1 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (react)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (react)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts index 4b1c7c7d1e..6a0cb55f78 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (react)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (react)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts index 1f600dd8cf..96f1160078 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (react)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (react)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts index 0b4b3e5d6c..e85d5debd3 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (react)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (react)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts index d07b4ab583..5dae598549 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (react)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (react)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts index 589e2ccaf3..40d6961206 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (react)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (react)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts index 42e57c4ce2..f6bbdc9e73 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (solid)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (solid)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts index 1cbe7ef20b..933f61b59c 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (solid)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (solid)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts index bd5cc10457..513b69f4ba 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (solid)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (solid)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts index d2cf977cfa..e2ce8ad9ee 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (solid)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (solid)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts index 017ac79af0..14353f1290 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (solid)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (solid)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts index a3d0a991d1..76d3a554bd 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (solid)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (solid)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts index 3db5e487b3..3d0bd34eaa 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts @@ -10,24 +10,24 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SsrCallIdRoute = SsrCallIdRouteImport.update({ - id: '/ssr-call/$id', - path: '/ssr-call/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const SsrCallIdRoute = SsrCallIdRouteImport.update({ + id: '/ssr-call/$id', + path: '/ssr-call/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -68,13 +68,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/ssr-call/$id': { - id: '/ssr-call/$id' - path: '/ssr-call/$id' - fullPath: '/ssr-call/$id' - preLoaderRoute: typeof SsrCallIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -82,6 +75,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/ssr-call/$id': { + id: '/ssr-call/$id' + path: '/ssr-call/$id' + fullPath: '/ssr-call/$id' + preLoaderRoute: typeof SsrCallIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts index c4d94659d9..3f67c1a500 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (vue)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (vue)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts index c6155bcead..56c9addca5 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (vue)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (vue)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts index dca17511b8..e9a6e31617 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (vue)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (vue)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts index 4c2166056a..df9312ccd1 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (vue)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (vue)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts index 25741baa62..67c4611644 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (vue)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (vue)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts index c1c2d581ba..6f51ef4bab 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (vue)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (vue)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts index 8e96bc8e04..6331216522 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (react)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (react)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts index 7e6fac4bbe..77d58e7b19 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (solid)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (solid)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts index e67ca0a420..3d03b9c1fa 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (vue)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (vue)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts index 1bdb7946b2..631314148a 100644 --- a/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (react)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (react)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts index ce3e1f8a21..4788d31854 100644 --- a/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (solid)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (solid)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts index f2b9e27acb..09c0bbe90b 100644 --- a/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (vue)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (vue)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts index c1dbf38ae5..eb4c9dc1d6 100644 --- a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (react)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (react)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts index 0828715220..19d5817d32 100644 --- a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (solid)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (solid)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts index a484f95d6a..42473fc694 100644 --- a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (vue)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (vue)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/solid/speed.bench.ts b/benchmarks/ssr/solid/speed.bench.ts index 0c4317415d..2f72977612 100644 --- a/benchmarks/ssr/solid/speed.bench.ts +++ b/benchmarks/ssr/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (solid)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (solid)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/benchmarks/ssr/vue/speed.bench.ts b/benchmarks/ssr/vue/speed.bench.ts index 849f042e3c..57b59e0504 100644 --- a/benchmarks/ssr/vue/speed.bench.ts +++ b/benchmarks/ssr/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (vue)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (vue)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/docs/router/api/file-based-routing.md b/docs/router/api/file-based-routing.md index ad3e07fad7..7c94d484d1 100644 --- a/docs/router/api/file-based-routing.md +++ b/docs/router/api/file-based-routing.md @@ -188,7 +188,7 @@ By default, this value is set to `false`. ### `autoCodeSplitting` -This feature is only available if you are using the TanStack Router Bundler Plugin. +This feature is only available if you are using the TanStack Router Bundler Plugin with Vite, Rspack/Rsbuild or Webpack. With Esbuild, setting it to `true` is an error. This option is used to enable automatic code-splitting for non-critical route configuration items. See the "Automatic Code-Splitting" guide for more information. diff --git a/docs/router/eslint/create-route-property-order.md b/docs/router/eslint/create-route-property-order.md index c22aa7c52d..453fd64acc 100644 --- a/docs/router/eslint/create-route-property-order.md +++ b/docs/router/eslint/create-route-property-order.md @@ -37,7 +37,10 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -55,7 +58,10 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -80,7 +86,10 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, }) ``` @@ -98,7 +107,10 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, }) ``` diff --git a/docs/router/guide/automatic-code-splitting.md b/docs/router/guide/automatic-code-splitting.md index be599845bc..859a19ff09 100644 --- a/docs/router/guide/automatic-code-splitting.md +++ b/docs/router/guide/automatic-code-splitting.md @@ -4,7 +4,7 @@ title: Automatic Code Splitting The automatic code splitting feature in TanStack Router allows you to optimize your application's bundle size by lazily loading route components and their associated data. This is particularly useful for large applications where you want to minimize the initial load time by only loading the necessary code for the current route. -To turn this feature on, simply set the `autoCodeSplitting` option to `true` in your bundler plugin configuration. This enables the router to automatically handle code splitting for your routes without requiring any additional setup. +To turn this feature on, simply set the `autoCodeSplitting` option to `true` in your bundler plugin configuration. This enables the router to automatically handle code splitting for your routes without requiring any additional setup. It is available with Vite, Rspack/Rsbuild and Webpack, not with Esbuild. ```ts // vite.config.ts diff --git a/docs/router/guide/deferred-data-loading.md b/docs/router/guide/deferred-data-loading.md index 9956542ebd..f378d7adbf 100644 --- a/docs/router/guide/deferred-data-loading.md +++ b/docs/router/guide/deferred-data-loading.md @@ -90,15 +90,16 @@ So, instead of using `defer` and `Await`, you'll instead want to use the Route's ```tsx // src/routes/posts.$postId.tsx import { createFileRoute } from '@tanstack/react-router' +import { noop } from '@tanstack/react-query' import { slowDataOptions, fastDataOptions } from '~/api/query-options' export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context: { queryClient } }) => { // Kick off the fetching of some slower data, but do not await it - queryClient.prefetchQuery(slowDataOptions()) + void queryClient.query(slowDataOptions()).catch(noop) // Fetch and await some data that resolves quickly - await queryClient.ensureQueryData(fastDataOptions()) + await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) }, }) ``` @@ -108,15 +109,16 @@ export const Route = createFileRoute('/posts/$postId')({ ```tsx // src/routes/posts.$postId.tsx import { createFileRoute } from '@tanstack/solid-router' +import { noop } from '@tanstack/solid-query' import { slowDataOptions, fastDataOptions } from '~/api/query-options' export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context: { queryClient } }) => { // Kick off the fetching of some slower data, but do not await it - queryClient.prefetchQuery(slowDataOptions()) + void queryClient.query(slowDataOptions()).catch(noop) // Fetch and await some data that resolves quickly - await queryClient.ensureQueryData(fastDataOptions()) + await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) }, }) ``` diff --git a/docs/router/guide/external-data-loading.md b/docs/router/guide/external-data-loading.md index c044db7757..4ffb318686 100644 --- a/docs/router/guide/external-data-loading.md +++ b/docs/router/guide/external-data-loading.md @@ -6,7 +6,7 @@ title: External Data Loading > [!IMPORTANT] > This guide is geared towards external state management libraries and their integration with TanStack Router for data fetching, ssr, hydration/dehydration and streaming. If you haven't read the standard [Data Loading](./data-loading.md) guide, please do so first. -For a full-stack React application, follow [TanStack Query with Start](/start/latest/docs/framework/react/guide/tanstack-query) for request-scoped SSR, hydration, and mutation invalidation with a tested example. +Router can coordinate loaders and an existing API without Start. If you also want an integrated server runtime and typed server functions for your React application, follow [TanStack Query with Start](/start/latest/docs/framework/react/guide/tanstack-query) for request-scoped SSR, hydration, and mutation invalidation with a tested example. ## To **Store** or to **Coordinate**? @@ -84,7 +84,8 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ // Use the `loader` option to ensure that the data is loaded - loader: () => queryClient.ensureQueryData(postsQueryOptions), + loader: () => + queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), component: () => { // Read the data from the cache and subscribe to updates const { @@ -108,7 +109,8 @@ When an error occurs while using `suspense` with `TanStack Query`, you need to l ```tsx export const Route = createFileRoute('/')({ - loader: () => queryClient.ensureQueryData(postsQueryOptions), + loader: () => + queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), errorComponent: ({ error, reset }) => { const router = useRouter() const queryErrorResetBoundary = useQueryErrorResetBoundary() diff --git a/docs/router/guide/router-context.md b/docs/router/guide/router-context.md index 5fc4001010..347082106f 100644 --- a/docs/router/guide/router-context.md +++ b/docs/router/guide/router-context.md @@ -278,9 +278,10 @@ Then, in your route: export const Route = createFileRoute('/todos')({ component: Todos, loader: async ({ context }) => { - await context.queryClient.ensureQueryData({ + await context.queryClient.query({ queryKey: ['todos', { userId: user.id }], queryFn: fetchTodos, + staleTime: 'static', }) }, }) diff --git a/docs/router/guide/type-safety.md b/docs/router/guide/type-safety.md index 2adffc58c5..3faaed79e7 100644 --- a/docs/router/guide/type-safety.md +++ b/docs/router/guide/type-safety.md @@ -137,12 +137,13 @@ As your application scales, TypeScript check times will naturally increase. Ther ### Only infer types you need -A great pattern with client side data caches (TanStack Query, etc.) is to prefetch data. For example with TanStack Query you might have a route which calls `queryClient.ensureQueryData` in a `loader`. +A great pattern with client side data caches (TanStack Query, etc.) is to prefetch data. For example with TanStack Query you might have a route which calls `queryClient.query` in a `loader`. ```tsx export const Route = createFileRoute('/posts/$postId/deep')({ + // (ctx: LoaderFnContext) => Promise loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.ensureQueryData(postQueryOptions(postId)), + queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), component: PostDeepComponent, }) @@ -154,12 +155,16 @@ function PostDeepComponent() { } ``` -This may look fine and for small route trees and you may not notice any TS performance issues. However in this case TS has to infer the loader's return type, despite it never being used in your route. If the loader data is a complex type with many routes that prefetch in this manner, it can slow down editor performance. In this case, the change is quite simple and let typescript infer Promise. +This may look fine and for small route trees and you may not notice any TS performance issues. However in this case TS has to infer the loader's return type, despite it never being used in your route. If the loader data is a complex type with many routes that prefetch in this manner, it can slow down editor performance. In this case, the change is quite simple and let typescript infer `Promise`. ```tsx export const Route = createFileRoute('/posts/$postId/deep')({ + // (ctx: LoaderFnContext) => Promise loader: async ({ context: { queryClient }, params: { postId } }) => { - await queryClient.ensureQueryData(postQueryOptions(postId)) + await queryClient.query({ + ...postQueryOptions(postId), + staleTime: 'static', + }) }, component: PostDeepComponent, }) diff --git a/docs/router/how-to/setup-testing.md b/docs/router/how-to/setup-testing.md index 48afa122f4..104cbedc0d 100644 --- a/docs/router/how-to/setup-testing.md +++ b/docs/router/how-to/setup-testing.md @@ -659,9 +659,10 @@ describe('React Query Integration', () => { path: '/posts', component: PostsList, loader: ({ context: { queryClient } }) => - queryClient.ensureQueryData({ + queryClient.query({ queryKey: ['posts'], queryFn: mockFetchPosts, + staleTime: 'static', }), }) diff --git a/docs/router/installation/with-esbuild.md b/docs/router/installation/with-esbuild.md index b5cad0622c..8ecd9b8d0a 100644 --- a/docs/router/installation/with-esbuild.md +++ b/docs/router/installation/with-esbuild.md @@ -25,7 +25,6 @@ export default { plugins: [ tanstackRouter({ target: 'react', - autoCodeSplitting: true, }), ], } @@ -50,10 +49,7 @@ const ctx = await esbuild.context({ format: 'esm', target: ['esnext'], sourcemap: true, - plugins: [ - solidPlugin(), - tanstackRouter({ target: 'solid', autoCodeSplitting: true }), - ], + plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], }) if (isDev) { @@ -72,6 +68,9 @@ Or, you can clone our [Quickstart Esbuild example](https://github.com/TanStack/r Now that you've added the plugin to your Esbuild configuration, you're all set to start using file-based routing with TanStack Router. +> [!NOTE] +> Automatic code splitting is not available with Esbuild: the plugin throws an error when `autoCodeSplitting` is `true`. Route generation works as usual. To split routes, use [manual code splitting](../guide/code-splitting.md) or another bundler. + ## Ignoring the generated route tree file If your project is configured to use a linter and/or formatter, you may want to ignore the generated route tree file. This file is managed by TanStack Router and therefore shouldn't be changed by your linter or formatter. diff --git a/docs/router/integrations/query.md b/docs/router/integrations/query.md index fd174187b5..707f90900c 100644 --- a/docs/router/integrations/query.md +++ b/docs/router/integrations/query.md @@ -152,7 +152,7 @@ Preload critical data in the route `loader` to avoid waterfalls and loading flas -# React +# Blocking `query` in loader ```tsx title="src/routes/posts.tsx" import { queryOptions, useSuspenseQuery, useQuery } from '@tanstack/react-query' @@ -165,7 +165,12 @@ const postsQuery = queryOptions({ export const Route = createFileRoute('/posts')({ // Ensure the data is in the cache before render - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ + ...postsQuery, + // returns data from cache immediately, otherwise executes a fetch + staleTime: 'static', + }), component: PostsPage, }) @@ -180,15 +185,15 @@ function PostsPage() { ### Prefetching and streaming -You can also prefetch with `fetchQuery` or `ensureQueryData` in a loader without consuming the data in a component. If you return the promise directly from the loader, it will be awaited and thus block the SSR request until the query finishes. If you don't await the promise nor return it, the query will be started on the server and will be streamed to the client without blocking the SSR request. +You can also prefetch with `query` in a loader without consuming the data in a component. If you return the promise directly from the loader, it will be awaited and thus block the SSR request until the query finishes. If you don't await the promise nor return it, the query will be started on the server and will be streamed to the client without blocking the SSR request. -# React +# Non-blocking `query` in loader ```tsx title="src/routes/users.$id.tsx" import { createFileRoute } from '@tanstack/react-router' -import { queryOptions, useQuery } from '@tanstack/react-query' +import { noop, queryOptions, useQuery } from '@tanstack/react-query' const userQuery = (id: string) => queryOptions({ @@ -197,15 +202,18 @@ const userQuery = (id: string) => }) export const Route = createFileRoute('/user/$id')({ - loader: ({ params }) => { - // do not await this nor return the promise, just kick off the query to stream it to the client - context.queryClient.fetchQuery(userQuery(params.id)) + loader: ({ context, params }) => { + // Do not await this nor return the promise, just kick off the query to stream it to the client + void context.queryClient.query(userQuery(params.id)).catch(noop) }, }) ``` +> [!NOTE] +> Previous versions of this guide used `queryClient.ensureQueryData` and `queryClient.prefetchQuery`. These methods are now deprecated in TanStack Query in favor of `queryClient.query`. See the TanStack Query [v5 migration guide](https://tanstack.com/query/latest/docs/framework/react/guides/migrating-to-v5#imperative-queryclient-methods) for more details. + ## Redirect handling If a query or mutation throws a `redirect(...)`, the integration intercepts it on the client and performs a router navigation. diff --git a/docs/start/config.json b/docs/start/config.json index 8fa644fc1c..36af0e6e0d 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -36,6 +36,10 @@ { "label": "Migrate from Next.js", "to": "framework/react/migrate-from-next-js" + }, + { + "label": "Migrate from the Release Candidate", + "to": "framework/react/migrate-from-release-candidate" } ] }, @@ -53,6 +57,10 @@ { "label": "Build from Scratch", "to": "framework/solid/build-from-scratch" + }, + { + "label": "Migrate from the Release Candidate", + "to": "framework/solid/migrate-from-release-candidate" } ] } diff --git a/docs/start/framework/react/guide/authentication-overview.md b/docs/start/framework/react/guide/authentication-overview.md index a8ccd4bbb4..e80ba97f8c 100644 --- a/docs/start/framework/react/guide/authentication-overview.md +++ b/docs/start/framework/react/guide/authentication-overview.md @@ -116,7 +116,7 @@ Build your own authentication system using TanStack Start's server functions and - **Full Control**: Complete customization over authentication flow - **Server Primitives**: Sessions, OAuth, CSRF, rate limiting — see [Authentication Server Primitives](./authentication-server-primitives.md) -- **Session Management**: HTTP-only cookies via `setResponseHeader`, read with `getRequestHeader` +- **Session Management**: HTTP-only cookies written with `setCookie`, read with `getCookie` - **Type Safety**: End-to-end type safety for authentication state ### 🌐 Other Excellent Options diff --git a/docs/start/framework/react/guide/authentication-server-primitives.md b/docs/start/framework/react/guide/authentication-server-primitives.md index 4fbd7e9e22..103e9c4455 100644 --- a/docs/start/framework/react/guide/authentication-server-primitives.md +++ b/docs/start/framework/react/guide/authentication-server-primitives.md @@ -28,47 +28,39 @@ Whichever you choose, the cookie flags matter: ```ts // src/server/session.ts import { - getRequestHeader, - setResponseHeader, + deleteCookie, + getCookie, + setCookie, } from '@tanstack/react-start/server' const SESSION_COOKIE = '__Host-session' const ONE_DAY = 60 * 60 * 24 +const sessionCookieOptions = { + httpOnly: true, + secure: true, + sameSite: 'lax', + path: '/', +} as const + export function setSessionCookie(token: string) { - setResponseHeader( - 'Set-Cookie', - [ - `${SESSION_COOKIE}=${token}`, - `HttpOnly`, - `Secure`, - `SameSite=Lax`, - `Path=/`, - `Max-Age=${ONE_DAY}`, - ].join('; '), - ) + setCookie(SESSION_COOKIE, token, { + ...sessionCookieOptions, + maxAge: ONE_DAY, + }) } export function clearSessionCookie() { - setResponseHeader( - 'Set-Cookie', - `${SESSION_COOKIE}=; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=0`, - ) + deleteCookie(SESSION_COOKIE, sessionCookieOptions) } export function readSessionToken(): string | null { - const header = getRequestHeader('cookie') - if (!header) return null - for (const part of header.split(/;\s*/)) { - // Split only on the FIRST '=' — signed/base64 values often contain '='. - const eq = part.indexOf('=') - if (eq === -1) continue - if (part.slice(0, eq) === SESSION_COOKIE) return part.slice(eq + 1) - } - return null + return getCookie(SESSION_COOKIE) ?? null } ``` +Write cookies with `setCookie` (or `appendResponseHeader('set-cookie', serialized)` for a cookie that a library already serialized). Do not use `setResponseHeader('Set-Cookie', ...)` for this: it replaces every cookie on the outgoing response, including cookies set by other middleware or returned by a handler. + | Flag | Why | | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | | `HttpOnly` | JavaScript can't read the cookie. An XSS bug can't exfiltrate the session. | @@ -169,7 +161,7 @@ For OAuth authorization-code flow: // src/server/oauth.functions.ts import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' -import { setResponseHeader } from '@tanstack/react-start/server' +import { setCookie } from '@tanstack/react-start/server' import crypto from 'node:crypto' const OAUTH_STATE_COOKIE = '__Host-oauth' @@ -190,10 +182,13 @@ export const startOAuth = createServerFn({ method: 'GET' }).handler( crypto.createHash('sha256').update(verifier).digest(), ) - setResponseHeader( - 'Set-Cookie', - `${OAUTH_STATE_COOKIE}=${signed({ state, verifier })}; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=600`, - ) + setCookie(OAUTH_STATE_COOKIE, signed({ state, verifier }), { + httpOnly: true, + secure: true, + sameSite: 'lax', + path: '/', + maxAge: 600, + }) throw redirect({ href: diff --git a/docs/start/framework/react/guide/authentication.md b/docs/start/framework/react/guide/authentication.md index dd8adcebee..c77c681ee0 100644 --- a/docs/start/framework/react/guide/authentication.md +++ b/docs/start/framework/react/guide/authentication.md @@ -35,7 +35,7 @@ Authentication involves many considerations including password security, session - **Authentication**: Who is this user? (Login/logout) - **Authorization**: What can this user do? (Permissions/roles) -TanStack Start provides the tools for both through server functions, sessions, and route protection. +TanStack Start provides server functions, request and cookie utilities, and route protection. Session storage and authentication come from your application or a library you choose. > Protect the data/API boundary first. Any server function, server route, or other API endpoint that returns or mutates private data must authorize the request itself. `beforeLoad` is useful for route UX: it keeps users out of screens they cannot use and avoids triggering work that would fail anyway. It is not the security boundary for the data. See [Authentication Server Primitives](./authentication-server-primitives.md) for the server-side pattern. @@ -48,6 +48,7 @@ Server functions handle sensitive authentication logic securely on the server: ```tsx import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' +import { getAppSession } from '~/utils/session' // Login server function export const loginFn = createServerFn({ method: 'POST' }) @@ -61,11 +62,9 @@ export const loginFn = createServerFn({ method: 'POST' }) } // Create session - const session = await useAppSession() - await session.update({ - userId: user.id, - email: user.email, - }) + const session = await getAppSession() + session.userId = user.id + await session.save() // Redirect to protected area throw redirect({ to: '/dashboard' }) @@ -73,16 +72,16 @@ export const loginFn = createServerFn({ method: 'POST' }) // Logout server function export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() - await session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ to: '/' }) }) // Get current user export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( async () => { - const session = await useAppSession() - const userId = session.data.userId + const session = await getAppSession() + const userId = session.userId if (!userId) { return null @@ -96,33 +95,53 @@ export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( ### 2. Session Management -TanStack Start provides secure HTTP-only cookie sessions: +Start does not provide a session API. This guide uses iron-session for encrypted cookie sessions. Start's cookie helpers connect it to server functions, server routes, and request middleware. + +For encrypted cookie sessions, install [iron-session](https://github.com/vvo/iron-session): + +```sh +pnpm add iron-session +``` + +This example uses iron-session 9's cookie adapter. Its Node runtime requires Node 22.13 or newer; check the library's runtime requirements for other deployment targets. ```tsx -// utils/session.ts -import { useSession } from '@tanstack/react-start/server' +// utils/session.ts — import only from server code +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' type SessionData = { - userId?: string - email?: string - role?: string + userId: string + oauthState: string } -export function useAppSession() { - return useSession({ - // Session configuration - name: 'app-session', - password: process.env.SESSION_SECRET!, // At least 32 characters - // Optional: customize cookie settings - cookie: { - secure: process.env.NODE_ENV === 'production', - sameSite: 'lax', - httpOnly: true, +export function getAppSession(ttl = 7 * 24 * 60 * 60) { + const password = process.env.SESSION_SECRET + if (!password || password.length < 32) { + throw new Error('SESSION_SECRET must be at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl, + cookieOptions: { + secure: process.env.NODE_ENV === 'production', + sameSite: 'lax', + httpOnly: true, + path: '/', + }, }, - }) + ) } ``` +Read fields directly from the returned session, change them, then `await session.save()` before returning or redirecting. Missing or expired sessions have no user ID. `session.destroy()` removes the browser cookie. Keep one session object for the operation; another call to `getAppSession()` reads the incoming request again. For middleware, pass that object through request context when downstream code needs the same mutations. + +The `getAppSession` helper belongs to your application. Start does not cache sessions, choose expiration rules, or synchronize concurrent writes. Keep secrets and session objects in server code, and read request-specific configuration inside the active request. + ### 3. Authentication Context Load the current user in your root route's `beforeLoad` so the initial server render and child routes receive the same authentication state. `useServerFn` returns a callable function, not an object with `data`, `isLoading`, or `refetch`. You can call a server function directly from `beforeLoad`. @@ -254,8 +273,9 @@ export const registerFn = createServerFn({ method: 'POST' }) }) // Create session - const session = await useAppSession() - await session.update({ userId: user.id }) + const session = await getAppSession() + session.userId = user.id + await session.save() return { success: true, user: { id: user.id, email: user.email } } }) @@ -323,8 +343,9 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' }) const state = generateRandomState() // Store state in session for CSRF protection - const session = await useAppSession() - await session.update({ oauthState: state }) + const session = await getAppSession() + session.oauthState = state + await session.save() // Generate OAuth URL const authUrl = generateOAuthUrl(provider, state) @@ -387,21 +408,9 @@ const hashedPassword = await bcrypt.hash(password, saltRounds) ### 2. Session Security -```tsx -// Use secure session configuration -export function useAppSession() { - return useSession({ - name: 'app-session', - password: process.env.SESSION_SECRET!, // 32+ characters - cookie: { - secure: process.env.NODE_ENV === 'production', // HTTPS only in production - sameSite: 'lax', // CSRF protection - httpOnly: true, // XSS protection - maxAge: 7 * 24 * 60 * 60, // 7 days - }, - }) -} -``` +Set the library's server-validated expiration as well as appropriate cookie attributes. In the iron-session example, `ttl` limits a sealed credential's lifetime from its latest save; saving again renews it. A numeric `cookieOptions.maxAge` controls browser retention. In iron-session 9, explicitly setting `maxAge: undefined` also disables seal expiry; omit the property to use the configured `ttl`. Use an application-validated timestamp or a server-side record if you also need an absolute lifetime that writes cannot extend. + +Use `httpOnly`, `sameSite`, and `path` deliberately, and require `secure: true` on HTTPS deployments. These cookie attributes complement server-side authorization and CSRF protections. Keep only the minimum session data and load current account permissions from their authoritative store. Logout removes a stateless cookie from the current browser; it cannot revoke a copy without server-side state. ### 3. Rate Limiting @@ -580,16 +589,14 @@ export const loginFn = createServerFn({ method: 'POST' }) ) .handler(async ({ data }) => { const user = await authenticateUser(data.email, data.password) - if (!user) return { error: 'Invalid credentials' } + if (!user) { + return { error: 'Invalid credentials' } + } - const session = await useAppSession() - await session.update( - { userId: user.id }, - { - // Extend session if remember me is checked - maxAge: data.rememberMe ? 30 * 24 * 60 * 60 : undefined, // 30 days vs session - }, - ) + const ttl = data.rememberMe ? 30 * 24 * 60 * 60 : 8 * 60 * 60 + const session = await getAppSession(ttl) + session.userId = user.id + await session.save() return { success: true } }) @@ -617,7 +624,6 @@ If you're migrating from client-side authentication (localStorage, context only) ### From Other Frameworks - **Next.js**: Replace API routes with server functions, migrate NextAuth sessions -- **Remix**: Convert loaders/actions to server functions, adapt session patterns - **SvelteKit**: Move form actions to server functions, update route protection ## Production Considerations diff --git a/docs/start/framework/react/guide/deferred-hydration.md b/docs/start/framework/react/guide/deferred-hydration.md index 1dc4760fa7..ba07d65b24 100644 --- a/docs/start/framework/react/guide/deferred-hydration.md +++ b/docs/start/framework/react/guide/deferred-hydration.md @@ -244,7 +244,7 @@ chunks only exist when `split` is enabled, so TypeScript rejects strategy-form Use procedural prefetch when you need custom work: ```tsx -import { useQueryClient } from '@tanstack/react-query' +import { noop, useQueryClient } from '@tanstack/react-query' import { Hydrate } from '@tanstack/react-start' import { visible } from '@tanstack/react-start/hydration' @@ -255,8 +255,10 @@ function DeferredReviews() { { - await preload() - await queryClient.prefetchQuery(reviewsQueryOptions) + await Promise.all([ + preload(), + queryClient.query(reviewsQueryOptions).catch(noop), + ]) }} > diff --git a/docs/start/framework/react/guide/early-hints.md b/docs/start/framework/react/guide/early-hints.md index a5913952e6..2341215022 100644 --- a/docs/start/framework/react/guide/early-hints.md +++ b/docs/start/framework/react/guide/early-hints.md @@ -164,6 +164,7 @@ Static Early Hints are collected from the final Start manifest resolved for the - CDN URL rewrites are reflected in Early Hints. - `crossOrigin` returned from `transformAssets` is reflected in Early Hints. - JavaScript hints follow the client output format: `modulepreload` for module output, or `preload; as=script` for IIFE output. +- JavaScript hints carry `fetchpriority=low`, matching the generated HTML preload links, so they don't compete with render-blocking stylesheets. - Per-request transforms with `cache: false` are reflected in Early Hints for that request. - Inlined CSS assets are skipped when Start's [CSS inlining](./css-styling#inline-route-css-in-production) build option inlines them into the HTML. diff --git a/docs/start/framework/react/guide/environment-functions.md b/docs/start/framework/react/guide/environment-functions.md index f472a3a26a..94fbb52501 100644 --- a/docs/start/framework/react/guide/environment-functions.md +++ b/docs/start/framework/react/guide/environment-functions.md @@ -121,3 +121,37 @@ Environment functions are tree-shaken based on the environment for each bundle p Functions created using `createIsomorphicFn()` are tree-shaken. All codes inside `.client()` are not included in server bundle, and vice-versa. On the server, functions created using `createClientOnlyFn()` are replaced with a function that throws an `Error` on the server. The reverse is true for `createServerOnlyFn` functions on the client. + +## Troubleshooting + +### A loader works on refresh but throws during navigation + +If a loader throws `createServerOnlyFn() functions can only be called on the server!` after clicking a link, check whether it calls a server-only helper directly. Route loaders also run in the browser during client navigation. `createServerOnlyFn` guards a local function, it does not send a request to the server. + +Wrap the server work in `createServerFn` and call that function from the loader: + +```tsx +import { createFileRoute } from '@tanstack/react-router' +import { createServerFn, createServerOnlyFn } from '@tanstack/react-start' + +const readOnlyOnServer = createServerOnlyFn(() => 'Read on the server') +const readThroughRpc = createServerFn().handler(() => readOnlyOnServer()) + +export const Route = createFileRoute('/example')({ + loader: () => readThroughRpc(), +}) +``` + +The server function runs directly during SSR and makes a request to the server when called in the browser. Test both a direct page request and navigation from another route. A successful refresh alone does not exercise the browser loader. + +The [execution-boundary tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/tests/environment-functions.spec.ts) include the failing direct call and the working server-function version. See [Server Functions](./server-functions.md) for validation and middleware when the function accepts user input. + +### Browser code throws `window is not defined` on the server + +This means browser-only code ran during server execution. Use the stack trace to find the first application or dependency module that reads `window`, `document`, or another browser API. + +For a browser-only component, render it inside `ClientOnly` from `@tanstack/react-router` with a useful fallback. The Start compiler removes its children from the server bundle, which lets the bundler remove imports used only by those children. The [ClientOnly example](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/src/routes/client-only.tsx) covers a component that reads `window` at module scope, and its [tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/tests/client-only.spec.ts) check the server fallback and hydrated content. + +A browser API used elsewhere, such as a route loader or server function, still needs the correct execution boundary. Move component side effects into an effect or event handler. For logic that needs different server and browser implementations, use `createIsomorphicFn` with both implementations. Wrapping a function in `createClientOnlyFn` does not defer its call until the browser, calling that wrapper on the server throws the client-only guard error instead. + +If the stack points into build tooling or the error persists in a minimal app with the correct boundary, include that app and the installed Start and bundler versions in a [bug report](https://github.com/TanStack/router/issues/new/choose). A compiler or dependency bug needs a reproducible fix, not a blanket change to rendering mode. diff --git a/docs/start/framework/react/guide/hosting.md b/docs/start/framework/react/guide/hosting.md index 5b4a8c2661..2d02f881b3 100644 --- a/docs/start/framework/react/guide/hosting.md +++ b/docs/start/framework/react/guide/hosting.md @@ -116,6 +116,32 @@ Deploy your application to Cloudflare Workers using their one-click deployment p A full TanStack Start example for Cloudflare Workers is available [here](https://github.com/TanStack/router/tree/main/examples/react/start-basic-cloudflare). +#### Deployment fails even though the Vite build succeeds + +If Wrangler reports a missing server entry or unresolved Start virtual modules, check whether your deployment command passes `--config wrangler.jsonc`. With the Cloudflare Vite plugin, that file is the build input. The plugin generates a deployment config with the built server entry and client assets, then writes `.wrangler/deploy/config.json` so Wrangler can find it. Forcing Wrangler to read the source config bypasses that redirect. + +Run these commands from the application directory to validate the generated deployment without publishing: + +```sh +pnpm run build +pnpm exec wrangler deploy --dry-run +``` + +Check that Wrangler reports the generated config under `dist`, rather than just the source `wrangler.jsonc`. Keep the source `main` set to `@tanstack/react-start/server-entry` or your custom server entry, and let the Vite plugin generate the deployment entry. Marking unresolved Start modules as external does not fix the missing build transformation. + +If your build and deployment run in separate jobs, preserve the build output and `.wrangler/deploy/config.json` with their relative paths, or explicitly pass the generated deployment config. Do not edit generated files to repair the source configuration. See Cloudflare's [generated configuration documentation](https://developers.cloudflare.com/workers/wrangler/configuration/#generated-configuration) for how Wrangler finds that output. + +For a named Cloudflare environment, select it when building. For example, if `env.staging` is defined in your source config: + +```sh +CLOUDFLARE_ENV=staging pnpm run build +pnpm exec wrangler deploy --dry-run +``` + +The plugin resolves the environment into the generated config. A later `wrangler deploy --env staging` does not select a different built environment. See [Cloudflare environments](https://developers.cloudflare.com/workers/vite-plugin/reference/cloudflare-environments/). + +The [Cloudflare fixture tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic-cloudflare/tests/app.spec.ts) exercise a generated-config dry run and preview the built app locally. A dry run validates packaging, it does not verify account permissions, a live domain, or deployed bindings. + ### Netlify ⭐ _Official Partner_ @@ -475,7 +501,7 @@ In your Appwrite project, navigate to the **Sites** page from the sidebar. Click 3. Confirm the build settings: - **Install command:** `npm install` - **Build command:** `npm run build` - - **Output directory:** `./dist` (if you're using Nitro v2 or v3, this should be `./.output`) + - **Output directory:** `./dist` (if you're using Nitro, this should be `./.output`) 4. Add any required **environment variables** 5. Click **Deploy** diff --git a/docs/start/framework/react/guide/import-protection.md b/docs/start/framework/react/guide/import-protection.md index 8bf47c729a..451d405f81 100644 --- a/docs/start/framework/react/guide/import-protection.md +++ b/docs/start/framework/react/guide/import-protection.md @@ -3,8 +3,6 @@ id: import-protection title: Import Protection --- -> **Experimental:** Import protection is experimental and subject to change. - Import protection prevents server-only code from leaking into client bundles and client-only code from leaking into server bundles. It runs inside TanStack Start and is enabled by default. ## How It Works diff --git a/docs/start/framework/react/guide/path-aliases.md b/docs/start/framework/react/guide/path-aliases.md index ff9735df83..bd75dc01ed 100644 --- a/docs/start/framework/react/guide/path-aliases.md +++ b/docs/start/framework/react/guide/path-aliases.md @@ -26,9 +26,7 @@ After updating your `tsconfig.json` file, configure your build tool so it resolv # Vite -## Vite 8 - -Vite 8+ has [built-in support for path aliases](https://vite.dev/config/shared-options#resolve-tsconfigpaths), which is disabled by default. To enable it, simply add the following configuration to your `vite.config.ts` file: +Vite has [built-in support for path aliases](https://vite.dev/config/shared-options#resolve-tsconfigpaths), which is disabled by default. To enable it, add the following configuration to your `vite.config.ts` file: ```ts // vite.config.ts @@ -42,31 +40,6 @@ export default defineConfig({ }) ``` -## Vite 7 and earlier - -For Vite 7 and earlier, install the `vite-tsconfig-paths` plugin to enable path aliases in your TanStack Start project. You can do this by running the following command: - -```sh -npm install -D vite-tsconfig-paths -``` - -Now, you'll need to update your `vite.config.ts` file to include the following: - -```ts -// vite.config.ts -import { defineConfig } from 'vite' -import viteTsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - plugins: [ - // this is the plugin that enables path aliases - viteTsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], -}) -``` - # Rsbuild Rsbuild reads the `paths` field from `tsconfig.json` by default. No extra config is needed when your aliases live in the root `tsconfig.json`. diff --git a/docs/start/framework/react/guide/rendering-markdown.md b/docs/start/framework/react/guide/rendering-markdown.md index 4258d6f4f1..bf644124d9 100644 --- a/docs/start/framework/react/guide/rendering-markdown.md +++ b/docs/start/framework/react/guide/rendering-markdown.md @@ -3,191 +3,85 @@ id: rendering-markdown title: Rendering Markdown --- -This guide covers two methods for importing and rendering markdown content in your TanStack Start application: +Use [TanStack Markdown](https://tanstack.com/markdown/latest/docs/overview) to render Markdown in your TanStack Start application. Its React renderer works synchronously during server rendering and client navigation, so content does not need to wait for a client effect. -1. **Static markdown** with `content-collections` for build-time loading (e.g., blog posts) -2. **Dynamic markdown** fetched at runtime from GitHub or any remote source +This guide covers static posts loaded with Content Collections and remote content fetched through a server function. Both use the same Markdown component. -Both methods share a common rendering pipeline using the `unified` ecosystem. +## Rendering Markdown -## Setting Up the Markdown Processor - -Both approaches use the same markdown-to-HTML processing pipeline. First, install the required dependencies: +Install TanStack Markdown: ```bash -npm install unified remark-parse remark-gfm remark-rehype rehype-raw rehype-slug rehype-autolink-headings rehype-stringify shiki html-react-parser gray-matter +npm install @tanstack/markdown ``` -Create a markdown processor utility: - -```tsx -// src/utils/markdown.ts -import { unified } from 'unified' -import remarkParse from 'remark-parse' -import remarkGfm from 'remark-gfm' -import remarkRehype from 'remark-rehype' -import rehypeRaw from 'rehype-raw' -import rehypeSlug from 'rehype-slug' -import rehypeAutolinkHeadings from 'rehype-autolink-headings' -import rehypeStringify from 'rehype-stringify' - -export type MarkdownHeading = { - id: string - text: string - level: number -} - -export type MarkdownResult = { - markup: string - headings: Array -} - -export async function renderMarkdown(content: string): Promise { - const headings: Array = [] - - const result = await unified() - .use(remarkParse) // Parse markdown - .use(remarkGfm) // Support GitHub Flavored Markdown - .use(remarkRehype, { allowDangerousHtml: true }) // Convert to HTML AST - .use(rehypeRaw) // Process raw HTML in markdown - .use(rehypeSlug) // Add IDs to headings - .use(rehypeAutolinkHeadings, { - behavior: 'wrap', - properties: { className: ['anchor'] }, - }) - .use(() => (tree) => { - // Extract headings for table of contents - const { visit } = require('unist-util-visit') - const { toString } = require('hast-util-to-string') - - visit(tree, 'element', (node: any) => { - if (['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(node.tagName)) { - headings.push({ - id: node.properties?.id || '', - text: toString(node), - level: parseInt(node.tagName.charAt(1), 10), - }) - } - }) - }) - .use(rehypeStringify) // Serialize to HTML string - .process(content) - - return { - markup: String(result), - headings, - } -} -``` - -## Creating a Markdown Component - -Create a React component that renders the processed HTML with custom element handling: +Create a shared component that accepts either Markdown source or a parsed document: ```tsx // src/components/Markdown.tsx -import parse, { type HTMLReactParserOptions, Element } from 'html-react-parser' -import { renderMarkdown, type MarkdownResult } from '~/utils/markdown' +import { Markdown as ReactMarkdown } from '@tanstack/markdown/react' +import type { MarkdownDocument } from '@tanstack/markdown' type MarkdownProps = { - content: string + content: string | MarkdownDocument className?: string } export function Markdown({ content, className }: MarkdownProps) { - const [result, setResult] = useState(null) - - useEffect(() => { - renderMarkdown(content).then(setResult) - }, [content]) - - if (!result) { - return
Loading...
- } - - const options: HTMLReactParserOptions = { - replace: (domNode) => { - if (domNode instanceof Element) { - // Customize rendering of specific elements - if (domNode.name === 'a') { - // Handle links - const href = domNode.attribs.href - if (href?.startsWith('/')) { - // Internal link - use your router's Link component - return ( - {domToReact(domNode.children, options)} - ) - } - } - - if (domNode.name === 'img') { - // Add lazy loading to images - return ( - - ) - } - } - }, - } - - return
{parse(result.markup, options)}
+ return ( +
+ {content} +
+ ) } ``` -## Method 1: Static Markdown with content-collections +Headings receive stable IDs, and `headingAnchors` adds links to them. Raw HTML is escaped and unsafe URL protocols are removed by default. Keep these defaults for remote or user-written content. TanStack Markdown does not execute MDX or implement every CommonMark or GFM feature, so check the [supported syntax](https://tanstack.com/markdown/latest/docs/core-concepts/syntax-profile) when migrating existing content. -The `content-collections` package is ideal for static content like blog posts that are included in your repository. It processes markdown files at build time and provides type-safe access to the content. - -### Installation - -```bash -npm install @content-collections/core @content-collections/vite -``` - -### Configuration - -Create a `content-collections.ts` file in your project root: +Use the `components` prop to customize elements, for example to lazy-load images: ```tsx + , + }} +> + {content} + +``` + +The examples below use `~/*` for the `src/*` import alias. The `prose` class is optional and requires your own typography styles, such as Tailwind Typography. + +## Static Markdown with Content Collections + +[Content Collections](https://www.content-collections.dev/docs/quickstart/tanstack-start) loads local Markdown files and validates their frontmatter. Pass the Markdown body from the generated collection to the shared renderer. + +### Installation and Configuration + +```bash +npm install -D @content-collections/core @content-collections/vite zod +``` + +```ts // content-collections.ts import { defineCollection, defineConfig } from '@content-collections/core' -import matter from 'gray-matter' - -function extractFrontMatter(content: string) { - const { data, content: body, excerpt } = matter(content, { excerpt: true }) - return { data, body, excerpt: excerpt || '' } -} +import { z } from 'zod' const posts = defineCollection({ name: 'posts', - directory: './src/blog', // Directory containing your .md files + directory: './src/blog', include: '*.md', - schema: (z) => ({ + schema: z.object({ title: z.string(), - published: z.string().date(), - description: z.string().optional(), - authors: z.string().array(), + published: z.string().regex(/^\d{4}-\d{2}-\d{2}$/), + description: z.string(), + authors: z.array(z.string()), + content: z.string(), + }), + transform: (post) => ({ + ...post, + slug: post._meta.path, }), - transform: ({ content, ...post }) => { - const frontMatter = extractFrontMatter(content) - - // Extract header image (first image in the document) - const headerImageMatch = content.match(/!\[([^\]]*)\]\(([^)]+)\)/) - const headerImage = headerImageMatch ? headerImageMatch[2] : undefined - - return { - ...post, - slug: post._meta.path, - excerpt: frontMatter.excerpt, - description: frontMatter.data.description, - headerImage, - content: frontMatter.body, - } - }, }) export default defineConfig({ @@ -195,39 +89,55 @@ export default defineConfig({ }) ``` -### Vite Integration +Content Collections already separates frontmatter from `content`, so this transform does not need a second frontmatter parser. -Add the content-collections plugin to your Vite config: +Add the plugin to your existing Vite configuration, keeping any deployment plugins your app needs: -```tsx -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' +```ts +// vite.config.ts import contentCollections from '@content-collections/vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ - vite: { - plugins: [contentCollections()], - }, + plugins: [ + contentCollections(), + tsConfigPaths({ projects: ['./tsconfig.json'] }), + tanstackStart(), + viteReact(), + ], }) ``` -### Creating Blog Posts +Add the generated collection alias to your existing `tsconfig.json`: -Create markdown files in your designated directory: +```json +{ + "compilerOptions": { + "paths": { + "~/*": ["./src/*"], + "content-collections": ["./.content-collections/generated"] + } + } +} +``` + +Add `.content-collections` to `.gitignore`. Starting the Vite dev server or running a build generates the collection. + +### Creating a Post + +Create `src/blog/hello-world.md`: ````markdown -## - -title: Hello World -published: 2024-01-15 -authors: - -- Jane Doe - description: My first blog post - --- - -![Hero Image](/images/hero.jpg) +title: Hello World +published: '2026-01-15' +description: My first blog post +authors: + - Jane Doe +--- Welcome to my blog! This is my first post. @@ -240,13 +150,11 @@ console.log('Hello, world!') ``` ```` -### Using the Collection - -Access your posts through the generated collection: +### Listing Posts ```tsx // src/routes/blog.index.tsx -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute, Link } from '@tanstack/react-router' import { allPosts } from 'content-collections' export const Route = createFileRoute('/blog/')({ @@ -254,31 +162,30 @@ export const Route = createFileRoute('/blog/')({ }) function BlogIndex() { - // Posts are sorted by published date - const sortedPosts = allPosts.sort( - (a, b) => new Date(b.published).getTime() - new Date(a.published).getTime(), + const sortedPosts = [...allPosts].sort((a, b) => + b.published.localeCompare(a.published), ) return ( -
+

Blog

    {sortedPosts.map((post) => (
  • -

    {post.title}

    -

    {post.excerpt}

    - {post.published} + {post.title} +

    {post.description}

    +
  • ))}
-
+ ) } ``` -### Rendering a Single Post +### Rendering a Post ```tsx // src/routes/blog.$slug.tsx @@ -288,7 +195,7 @@ import { Markdown } from '~/components/Markdown' export const Route = createFileRoute('/blog/$slug')({ loader: ({ params }) => { - const post = allPosts.find((p) => p.slug === params.slug) + const post = allPosts.find((post) => post.slug === params.slug) if (!post) { throw notFound() } @@ -302,202 +209,169 @@ function BlogPost() { return (
-
-

{post.title}

-

- By {post.authors.join(', ')} on {post.published} -

-
+

{post.title}

+

+ By {post.authors.join(', ')} on {post.published} +

) } ``` -## Method 2: Dynamic Markdown from Remote Sources +The renderer parses the Markdown synchronously and renders React elements on both the server and client. -For content stored externally (like GitHub repositories), you can fetch and render markdown dynamically using server functions. +## Remote Markdown with a Server Function -### Creating a Fetch Utility +Fetch remote content in a server function and parse it before returning it to the route. Install `gray-matter` if the remote files contain frontmatter: -```tsx -// src/utils/docs.server.ts +```bash +npm install gray-matter +``` + +Keep the repository, branch, and content directory in server code. Validate the requested filename before building the URL: + +```ts +// src/utils/docs.ts import { createServerFn } from '@tanstack/react-start' +import { notFound } from '@tanstack/react-router' +import { parseMarkdown } from '@tanstack/markdown/parser' import matter from 'gray-matter' -type FetchDocsParams = { - repo: string // e.g., 'tanstack/router' - branch: string // e.g., 'main' - filePath: string // e.g., 'docs/guide/getting-started.md' -} - export const fetchDocs = createServerFn({ method: 'GET' }) - .validator((params: FetchDocsParams) => params) - .handler(async ({ data: { repo, branch, filePath } }) => { - const url = `https://raw.githubusercontent.com/${repo}/${branch}/${filePath}` - - const response = await fetch(url, { - headers: { - // Add GitHub token for private repos or higher rate limits - // Authorization: `token ${process.env.GITHUB_TOKEN}`, - }, - }) + .validator((slug: unknown) => { + if (typeof slug !== 'string' || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(slug)) { + throw new Error('Invalid document slug') + } + return slug + }) + .handler(async ({ data: slug }) => { + // Replace this with your public repository's content directory. + const baseUrl = + 'https://raw.githubusercontent.com/your-org/your-repo/main/docs' + const response = await fetch(`${baseUrl}/${slug}.md`) + if (response.status === 404) { + throw notFound() + } if (!response.ok) { - throw new Error(`Failed to fetch: ${response.status}`) + throw new Error(`Failed to fetch document: ${response.status}`) } - const rawContent = await response.text() - const { data: frontmatter, content } = matter(rawContent) + const { data, content } = matter(await response.text()) return { - frontmatter, - content, - filePath, + title: typeof data.title === 'string' ? data.title : slug, + document: parseMarkdown(content), } }) ``` -### Adding Cache Headers - -For production, add appropriate cache headers: - ```tsx -export const fetchDocs = createServerFn({ method: 'GET' }) - .validator((params: FetchDocsParams) => params) - .handler(async ({ data: { repo, branch, filePath }, context }) => { - // Set cache headers for CDN caching - context.response.headers.set( - 'Cache-Control', - 'public, max-age=0, must-revalidate', - ) - context.response.headers.set( - 'CDN-Cache-Control', - 'max-age=300, stale-while-revalidate=300', - ) - - // ... fetch logic - }) -``` - -### Using Dynamic Markdown in Routes - -```tsx -// src/routes/docs.$path.tsx +// src/routes/docs.$slug.tsx import { createFileRoute } from '@tanstack/react-router' -import { fetchDocs } from '~/utils/docs.server' import { Markdown } from '~/components/Markdown' +import { fetchDocs } from '~/utils/docs' -export const Route = createFileRoute('/docs/$path')({ - loader: async ({ params }) => { - return fetchDocs({ - data: { - repo: 'your-org/your-repo', - branch: 'main', - filePath: `docs/${params.path}.md`, - }, - }) - }, +export const Route = createFileRoute('/docs/$slug')({ + loader: ({ params }) => fetchDocs({ data: params.slug }), component: DocsPage, }) function DocsPage() { - const { frontmatter, content } = Route.useLoaderData() + const { title, document } = Route.useLoaderData() return (
-

{frontmatter.title}

- +

{title}

+
) } ``` -### Fetching Directory Contents +Relative Markdown links and image URLs resolve against your app's URL, not the source repository. Use app-relative or absolute URLs in the content, or transform them for your site's route and asset layout. -To build navigation from a GitHub directory: +## Syntax Highlighting with TanStack Highlight -```tsx -// src/utils/docs.server.ts -type GitHubContent = { - name: string - path: string - type: 'file' | 'dir' -} +Install [TanStack Highlight](https://tanstack.com/highlight/latest/docs/overview). The Markdown adapter requires version `0.0.6` or newer: -export const fetchRepoContents = createServerFn({ method: 'GET' }) - .validator((params: { repo: string; branch: string; path: string }) => params) - .handler(async ({ data: { repo, branch, path } }) => { - const url = `https://api.github.com/repos/${repo}/contents/${path}?ref=${branch}` - - const response = await fetch(url, { - headers: { - Accept: 'application/vnd.github.v3+json', - // Authorization: `token ${process.env.GITHUB_TOKEN}`, - }, - }) - - if (!response.ok) { - throw new Error(`Failed to fetch contents: ${response.status}`) - } - - const contents: Array = await response.json() - - return contents - .filter((item) => item.type === 'file' && item.name.endsWith('.md')) - .map((item) => ({ - name: item.name.replace('.md', ''), - path: item.path, - })) - }) +```bash +npm install @tanstack/highlight ``` -## Adding Syntax Highlighting with Shiki +Register the languages your content uses and create the Markdown adapter: -For code blocks with syntax highlighting, integrate Shiki into your markdown processor: +```ts +// src/utils/markdown-highlighter.ts +import { createHighlighter } from '@tanstack/highlight/core' +import { js } from '@tanstack/highlight/languages/js' +import { plaintext } from '@tanstack/highlight/languages/plaintext' +import { ts } from '@tanstack/highlight/languages/ts' +import { tsx } from '@tanstack/highlight/languages/tsx' +import { createTanStackMarkdownHighlighter } from '@tanstack/highlight/markdown' -```tsx -// src/utils/markdown.ts -import { codeToHtml } from 'shiki' +const highlighter = createHighlighter({ + languages: [plaintext, js, ts, tsx], +}) -// Process code blocks after parsing -export async function highlightCode( - code: string, - language: string, -): Promise { - return codeToHtml(code, { - lang: language, - themes: { - light: 'github-light', - dark: 'tokyo-night', - }, - }) -} +export const highlightMarkdownCode = + createTanStackMarkdownHighlighter(highlighter) ``` -Then handle code blocks in your Markdown component: +Update the shared component to pass the highlighter and include its theme styles: ```tsx -// In your Markdown component's replace function -if (domNode.name === 'pre') { - const codeElement = domNode.children.find( - (child) => child instanceof Element && child.name === 'code', +// src/components/Markdown.tsx +import { createThemeCss } from '@tanstack/highlight/theme' +import { githubDarkTheme } from '@tanstack/highlight/themes/github-dark' +import { githubLightTheme } from '@tanstack/highlight/themes/github-light' +import { Markdown as ReactMarkdown } from '@tanstack/markdown/react' +import type { MarkdownDocument } from '@tanstack/markdown' +import { highlightMarkdownCode } from '~/utils/markdown-highlighter' + +const themeCss = createThemeCss({ + light: githubLightTheme, + dark: githubDarkTheme, + lightSelector: '.markdown-renderer', + darkSelector: '.dark .markdown-renderer', + codeBlockSelector: '.markdown-renderer pre.tm-code', + lineNumbersSelector: '.markdown-renderer .tm-code--line-numbers', +}) + +type MarkdownProps = { + content: string | MarkdownDocument + className?: string +} + +export function Markdown({ content, className }: MarkdownProps) { + return ( +
+ + + {content} + +
) - if (codeElement) { - const className = codeElement.attribs.class || '' - const language = className.replace('language-', '') || 'text' - const code = getText(codeElement) - - return - } } ``` -## Summary +The adapter returns escaped token markup inside the renderer's own `
` elements. Unknown languages fall back to plain text. Add a `dark` class to an ancestor to select the dark theme. See the [syntax highlighting guide](https://tanstack.com/markdown/latest/docs/guides/syntax-highlighting) for line numbers and highlighted lines.
 
-| Approach            | Best For                                  | Pros                                           | Cons                                      |
-| ------------------- | ----------------------------------------- | ---------------------------------------------- | ----------------------------------------- |
-| content-collections | Blog posts, static docs bundled with app  | Type-safe, build-time processing, fast runtime | Requires rebuild for content updates      |
-| Dynamic fetching    | External docs, frequently updated content | Always fresh, no rebuild needed                | Runtime overhead, requires error handling |
+## Table of Contents
 
-Choose the approach that best fits your content update frequency and deployment workflow. For hybrid scenarios, you can use both methods in the same application.
+To collect headings, add the docs preset when parsing the document:
+
+```ts
+import { docsMarkdownExtensions } from '@tanstack/markdown/extensions/docs'
+import { parseMarkdown } from '@tanstack/markdown/parser'
+
+const document = parseMarkdown(content, {
+  extensions: docsMarkdownExtensions(),
+})
+
+const headings = document.headings ?? []
+// Each heading has an id, text, and level.
+```
+
+Use this in the server function, then render links to each heading's `id`. The [docs preset guide](https://tanstack.com/markdown/latest/docs/guides/docs-preset) also covers callouts and custom comment components. Those features need the same extensions passed to the renderer.
diff --git a/docs/start/framework/react/guide/server-components.md b/docs/start/framework/react/guide/server-components.md
index 6bbc716754..581ae145bd 100644
--- a/docs/start/framework/react/guide/server-components.md
+++ b/docs/start/framework/react/guide/server-components.md
@@ -86,7 +86,7 @@ export default defineConfig({
 
 
 
-**Requirements:** React 19+, Vite 7+ or Rsbuild 2+
+**Requirements:** React 19+, Vite 8+ or Rsbuild 2+
 
 ## Quick Start
 
@@ -401,7 +401,10 @@ const postQueryOptions = (postId: string) => ({
 export const Route = createFileRoute('/posts/$postId')({
   loader: async ({ context, params }) => {
     // Prefetch during SSR - data reused on client without refetch
-    await context.queryClient.ensureQueryData(postQueryOptions(params.postId))
+    await context.queryClient.query({
+      ...postQueryOptions(params.postId),
+      staleTime: 'static',
+    })
   },
   component: PostPage,
 })
diff --git a/docs/start/framework/react/guide/server-entry-point.md b/docs/start/framework/react/guide/server-entry-point.md
index 127b04fc86..5f74eb7846 100644
--- a/docs/start/framework/react/guide/server-entry-point.md
+++ b/docs/start/framework/react/guide/server-entry-point.md
@@ -4,35 +4,71 @@ title: Server Entry Point
 ---
 
 > [!NOTE]
-> The server entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the server entry point for you using the below as a default.
+> A custom server entry point is **optional**. Without one, TanStack Start uses its built-in entry, which renders requests and converts uncaught errors into HTTP responses automatically.
 
 The Server Entry Point supports the universal fetch handler format, commonly used by [Cloudflare Workers](https://developers.cloudflare.com/workers/runtime-apis/handlers/fetch/) and other WinterCG-compatible runtimes.
 
-To ensure interoperability, the default export must conform to our `ServerEntry` interface:
-
-```ts
-export default {
-  fetch(req: Request, opts?: RequestOptions): Response | Promise {
-    // ...
-  },
-}
-```
-
-TanStack Start exposes a wrapper to make creation type-safe. This is done in the `src/server.ts` file.
+The default export must provide a `fetch` method that accepts a `Request` and Start's request options, then returns a `Response` or `Promise`. Use `createServerEntry` to infer these types and keep the complete callback inside the request's context, including custom error handling. For example, this custom `src/server.ts` delegates to the built-in entry:
 
 ```tsx
 // src/server.ts
 import handler, { createServerEntry } from '@tanstack/react-start/server-entry'
 
 export default createServerEntry({
-  fetch(request) {
-    return handler.fetch(request)
+  fetch(request, opts) {
+    return handler.fetch(request, opts)
   },
 })
 ```
 
 Whether we are statically generating our app or serving it dynamically, the `server.ts` file is the entry point for doing all SSR-related work as well as for handling server routes and server function requests.
 
+## Configuring a Custom Server Entry
+
+Start automatically detects `src/server.ts`. If that file is absent, it uses the built-in entry. For a custom entry at another path, configure `server.entry` in your bundler plugin. This path is resolved relative to `srcDirectory`, which defaults to `src`.
+
+
+
+# Vite
+
+```ts title="vite.config.ts"
+import { defineConfig } from 'vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteReact from '@vitejs/plugin-react'
+
+export default defineConfig({
+  plugins: [
+    tanstackStart({
+      server: {
+        entry: './server-entry.ts',
+      },
+    }),
+    viteReact(),
+  ],
+})
+```
+
+# Rsbuild
+
+```ts title="rsbuild.config.ts"
+import { defineConfig } from '@rsbuild/core'
+import { pluginReact } from '@rsbuild/plugin-react'
+import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild'
+
+export default defineConfig({
+  plugins: [
+    pluginReact(),
+    tanstackStart({
+      server: {
+        entry: './server-entry.ts',
+      },
+    }),
+  ],
+})
+```
+
+
+
 ## Custom Server Handlers
 
 You can create custom server handlers to modify how your application is rendered:
@@ -51,16 +87,155 @@ const customHandler = defineHandlerCallback((ctx) => {
   return defaultStreamHandler(ctx)
 })
 
-const fetch = createStartHandler(customHandler)
+const startHandler = createStartHandler(customHandler)
 
 export default createServerEntry({
-  fetch,
+  fetch(request, opts) {
+    return startHandler(request, opts)
+  },
 })
 ```
 
+## Error Handling
+
+The built-in entry uses `createServerEntry` to catch errors that escape the Start handler and call `handleStartError(error)` inside the active request context. This works without a custom `src/server.ts`. Response helpers such as `setResponseStatus`, `setResponseHeader`, and `setCookie` are applied to the error response.
+
+For an uncaught error, Start returns a generic JSON error body with status `500` unless a response helper or HTTP-style error property supplies an error status. A thrown `Response` keeps its body and response metadata, with response helpers applied, and loses its body for `HEAD` requests and for statuses `204`, `205`, and `304`, including one selected by a helper. The generic error body Start generates always uses an error status, so only `HEAD` removes it.
+
+For example, a request to this server route returns `401` with a `WWW-Authenticate` header:
+
+```tsx
+// src/routes/api/protected.ts
+import { createFileRoute } from '@tanstack/react-router'
+import { createMiddleware } from '@tanstack/react-start'
+import {
+  setResponseHeader,
+  setResponseStatus,
+} from '@tanstack/react-start/server'
+
+const authMiddleware = createMiddleware().server(() => {
+  setResponseStatus(401, 'Unauthorized')
+  setResponseHeader('www-authenticate', 'Bearer')
+  throw new Error('Unauthorized')
+})
+
+export const Route = createFileRoute('/api/protected')({
+  server: {
+    middleware: [authMiddleware],
+    handlers: {
+      GET: () => new Response('Protected content'),
+    },
+  },
+})
+```
+
+Error conversion preserves:
+
+- Error statuses (`400`-`599`) and their status text from `setResponseStatus`
+- Header operations from the response helpers
+- Cookies from `setCookie` and `appendResponseHeader('set-cookie', ...)`, including multiple `Set-Cookie` headers
+- HTTP-style error metadata such as `error.status`, `error.statusText`, `error.headers`, and `error.cause.headers`
+
+Start builds a new JSON body for an error, so it never copies the framing and connection headers `Content-Length`, `Content-Encoding`, `Transfer-Encoding`, `Trailer`, `Connection`, `Keep-Alive`, `Proxy-Connection`, and `TE` from error metadata. When `error.cause` is a `Response`, such as a failed upstream `fetch` from any fetch implementation, Start uses its status and status text but none of its headers, because they were written for that upstream reply.
+
+Explicit helper error statuses, their status text, and header operations take precedence over error metadata. An error response only uses an error status (`400`-`599`). A status set with `setResponseStatus` before the error applies only when it is an error status. A success, redirect, or bodyless status such as `200`, `201`, `302`, or `204` describes the response that the failure replaced, so Start discards it together with its status text and uses the error's own status or `500`. Error metadata such as `error.status` or `error.statusCode` likewise applies only when it is `400` or higher.
+
+Start logs the error to the server console unless the error's own metadata marks it as an HTTP error with a status of `400` or higher, even when a helper selected the status. The generic JSON body does not expose the error's message or stack.
+
+Errors that Router handles through route error components do not reach this top-level catch. Server function calls and their request middleware use a separate error response path that preserves the RPC serialization protocol. Failures during initialization, before that path is established, fall back to the top-level error response. Errors in a streamed body after the entry has returned its `Response` cannot replace that response's status or headers.
+
+You can use `createServerEntry` with your own `try`/`catch`, including for error reporting with Sentry. Your catch runs first; the wrapper converts only errors that escape your callback. Call the handler returned by `createStartHandler(...)` inside that catch, because it rethrows the original uncaught value:
+
+```tsx
+// src/server.ts
+import {
+  createStartHandler,
+  defaultStreamHandler,
+  handleStartError,
+} from '@tanstack/react-start/server'
+import { createServerEntry } from '@tanstack/react-start/server-entry'
+
+const startHandler = createStartHandler(defaultStreamHandler)
+
+export default createServerEntry({
+  async fetch(request, opts) {
+    try {
+      return await startHandler(request, opts)
+    } catch (error) {
+      // Report the original error here, for example to Sentry.
+      return handleStartError(error)
+    }
+  },
+})
+```
+
+After reporting, choose how to finish the catch:
+
+- Return `handleStartError(error)` to obtain Start's error response explicitly.
+- Rethrow `error` to let `createServerEntry` produce that same error response.
+- Return your own `Response` to choose its body, status, and headers.
+
+All three options keep `createServerEntry` and its request context. The first two preserve Start's response-helper state.
+
+The wrapper creates the request context before calling your `fetch` callback. The entire callback, including its own catch and code after `await`, runs inside that context. Calling the Start handler with the same `Request` reuses it. `handleStartError` therefore uses the correct request's state even when the thrown value is a primitive, or several requests throw the same `Error` object. Start does not attach request state to errors or remember them for a later catch. A catch outside this wrapper cannot recover a completed request's helper state from the error.
+
+The default export from `@tanstack/react-start/server-entry` is already wrapped. Calling its `fetch` method converts uncaught errors before an outer catch can see them. Use the handler returned by `createStartHandler(...)` inside your callback when you need to catch the original error, as above.
+
+Delegating to the default entry or another wrapped entry with the same `Request` object shares the current request context. A cloned or rewritten `Request` starts a separate context. When passing a new request to a raw `createStartHandler` handler, wrap that invocation with `createServerEntry` too, so errors are converted before leaving the new context:
+
+```tsx
+import {
+  createStartHandler,
+  defaultStreamHandler,
+} from '@tanstack/react-start/server'
+import { createServerEntry } from '@tanstack/react-start/server-entry'
+
+const rewrittenEntry = createServerEntry({
+  fetch: createStartHandler(defaultStreamHandler),
+})
+
+export default createServerEntry({
+  fetch(request, opts) {
+    const url = new URL(request.url)
+    if (url.pathname === '/legacy-home') {
+      url.pathname = '/'
+    }
+    return rewrittenEntry.fetch(new Request(url, request), opts)
+  },
+})
+```
+
+The rewritten request owns its response helper state. Catching a raw rewritten handler's error only in the original request's scope would not recover the rewritten request's headers or cookies.
+
+To replace an uncaught error response completely, return your own response from the custom catch:
+
+```tsx
+// src/server.ts
+import {
+  createStartHandler,
+  defaultStreamHandler,
+} from '@tanstack/react-start/server'
+import { createServerEntry } from '@tanstack/react-start/server-entry'
+
+const startHandler = createStartHandler(defaultStreamHandler)
+
+export default createServerEntry({
+  async fetch(request, opts) {
+    try {
+      return await startHandler(request, opts)
+    } catch (error) {
+      console.error(error)
+      return new Response('Internal Server Error', { status: 500 })
+    }
+  },
+})
+```
+
+`createServerEntry` returns custom responses as-is, whether they come from a catch or a successful callback. Such responses do not automatically inherit helper state. Likewise, helper writes after `await handler.fetch(...)` are not automatically applied to its returned response; modify that response directly or put the helper writes in Start middleware. Call `handleStartError` in a catch when the error response should inherit helper state.
+
 ## Request context
 
-When your server needs to pass additional, typed data into request handlers (for example, authenticated user info, a database connection, or per-request flags), register a request context type via TypeScript module augmentation. The registered context is delivered as the second argument to the server `fetch` handler and is available throughout the server-side middleware chain — including global middleware, request/function middleware, server routes, server functions, and the router itself.
+When your server needs to pass additional, typed data into request handlers (for example, authenticated user info, a database connection, or per-request flags), register a request context type via TypeScript module augmentation. Pass the runtime values through the `context` property of the second argument to `handler.fetch`. Type registration does not create these values. The context is available throughout the server-side middleware chain — including global middleware, request/function middleware, server routes, server functions, and the router itself.
 
 To add types for your request context, augment the `Register` interface from `@tanstack/react-router` with a `server.requestContext` property. The runtime `context` you pass to `handler.fetch` will then match that type. Example:
 
@@ -81,8 +256,11 @@ declare module '@tanstack/react-router' {
 }
 
 export default createServerEntry({
-  async fetch(request) {
-    return handler.fetch(request, { context: { hello: 'world', foo: 123 } })
+  fetch(request, opts) {
+    return handler.fetch(request, {
+      ...opts,
+      context: { hello: 'world', foo: 123 },
+    })
   },
 })
 ```
diff --git a/docs/start/framework/react/guide/server-functions.md b/docs/start/framework/react/guide/server-functions.md
index 903e5d7b86..879aa9e867 100644
--- a/docs/start/framework/react/guide/server-functions.md
+++ b/docs/start/framework/react/guide/server-functions.md
@@ -390,7 +390,7 @@ Stream typed data from server functions to the client. See the [Streaming Data f
 
 ### Raw Responses
 
-Return `Response` objects binary data, or custom content types.
+Return a `Response` for binary data or custom content types, and the call resolves with it. Throw a `Response` instead to reject the call with it. Either way, the caller receives its body and headers, and its status unless a response helper set one. The browser follows a `Response` with a redirect status and a `Location` header before the caller sees it, so use `redirect()` to send the user elsewhere.
 
 ### Progressive Enhancement
 
@@ -425,7 +425,9 @@ Customization:
 
 You can customize function ID generation for the production build by providing a `generateFunctionId` function when configuring the TanStack Start build tool plugin.
 
-Prefer deterministic inputs (filename + functionName) so IDs remain stable between builds.
+Return `undefined` (or an empty string) to use the default ID. Prefer deterministic inputs (filename + functionName) so IDs remain stable between builds.
+
+The ID becomes one segment of the server function's URL (`/_serverFn/`), unencoded, so use only ASCII letters, digits, `-`, `.`, `_`, `~` and `$`, and not `.` or `..`. An ID with whitespace, a control or non-ASCII character, or any of `"`, `#`, `/`, `<`, `>`, `?`, `\`, `^`, `` ` ``, `{` and `}`, an ID that is `.` or `..`, or one with a percent-encoding the server reads as another ID (`%41` for `A`, lowercase hex, `%2E`) or rejects, fails the build with an error naming the file, the function and the ID: the request would reach another function or none. Other characters (`%`, `+`, `:`, `;`, `@`, `'`, `|`, `[`, `]`, …) still work, with a deprecation warning: the next major version rejects them, since proxies and servers may encode or normalise them in the URL. `filename` contains `/`, so hash it (as in the example below) rather than embedding it as is.
 
 Please note that this customization is **experimental** and subject to change.
 
diff --git a/docs/start/framework/react/guide/tanstack-query.md b/docs/start/framework/react/guide/tanstack-query.md
index 7797ae306b..dec42ca26c 100644
--- a/docs/start/framework/react/guide/tanstack-query.md
+++ b/docs/start/framework/react/guide/tanstack-query.md
@@ -1,6 +1,12 @@
 ---
 id: tanstack-query
 title: TanStack Query
+updated: '2026-09-11'
+testedWith:
+  '@tanstack/react-start': '1.168.52'
+  '@tanstack/react-query': '5.102.0'
+  react: '19.2.3'
+  vite: '8.0.14'
 description: Use TanStack Query with TanStack Start for request-isolated SSR, hydration, route preloading, streaming, and mutation invalidation.
 ---
 
diff --git a/docs/start/framework/react/migrate-from-next-js.md b/docs/start/framework/react/migrate-from-next-js.md
index 5739846a95..dc5377df08 100644
--- a/docs/start/framework/react/migrate-from-next-js.md
+++ b/docs/start/framework/react/migrate-from-next-js.md
@@ -10,7 +10,7 @@ Start does not interpret Next.js route conventions or configuration. Keep your a
 
 ## Run the reference application
 
-Use Node 24 or newer and pnpm 11:
+Use Node 24 or newer and pnpm 12:
 
 ```sh
 git clone --depth 1 https://github.com/TanStack/router.git
@@ -22,7 +22,7 @@ cd examples/react/start-next-migration
 
 Follow the example's [README](https://github.com/TanStack/router/blob/main/examples/react/start-next-migration/README.md) to set `SESSION_PASSWORD` and `DEMO_PASSWORD`. Run `pnpm dev:next` at `http://localhost:3100` and `pnpm dev` in another terminal at `http://localhost:3101`.
 
-The example's single account is `reader@example.com`. It stores one saved-article flag in a session cookie so you can exercise a protected mutation without connecting a database. It is not a production authentication implementation. The two apps use different session formats and cookie names, so sign in separately to each.
+The example's single account is `reader@example.com`. It stores one saved-article flag in a session cookie so you can exercise a protected mutation without connecting a database. It is not a production authentication implementation. Both apps use iron-session with different cookie names, so sign in separately to each.
 
 With those ports free, run:
 
@@ -148,7 +148,7 @@ Next.js Action forms and these Start event-handler forms have different no-JavaS
 
 Follow the [authentication guide](./guide/authentication) for the route-context pattern. Check sessions on the server for private reads and mutations. A hidden button or a client route guard is not authorization.
 
-The example deliberately changes from `iron-session` with Next.js `cookies()` to Start's `useSession`. Existing cookies are not assumed to be compatible. A real migration can keep its existing auth provider or session service and adapt the request boundary instead. If sessions must survive cutover or rollback, verify cookie names, domains, paths, signing/encryption formats, expiration, key rotation, and logout in both deployments.
+The example keeps `iron-session` and replaces Next.js `cookies()` with a small adapter using Start's `getCookie` and `setCookie`. Start does not provide a session API. The example uses different cookie names to keep its two local apps independent; sharing a library alone does not make every session configuration compatible. A real migration can keep its existing auth provider or session service and adapt the request boundary instead. If sessions must survive cutover or rollback, verify cookie names, domains, paths, signing/encryption formats, expiration, key rotation, and logout in both deployments.
 
 Private pages need a cache policy that prevents another user receiving personalized HTML. The Start reference returns `Cache-Control: private, no-store` for `/saved`. Check the final response through your deployment and CDN, including after sign-in and sign-out. Do not prerender or publicly cache pages that include private account data.
 
diff --git a/docs/start/framework/react/migrate-from-release-candidate.md b/docs/start/framework/react/migrate-from-release-candidate.md
new file mode 100644
index 0000000000..5cfa614cda
--- /dev/null
+++ b/docs/start/framework/react/migrate-from-release-candidate.md
@@ -0,0 +1,39 @@
+---
+id: migrate-from-release-candidate
+title: Migrate from the Release Candidate
+description: Upgrade a TanStack Start release-candidate app to the first stable release, 1.169.
+---
+
+`@tanstack/react-start` 1.169 is the first stable release of TanStack Start. Upgrading from a release candidate means replacing the removed APIs below and checking the behavior changes that apply to your app.
+
+## Vite 8
+
+Start requires Vite 8 when you build with Vite. Upgrade with Vite's [migration guide](https://vite.dev/guide/migration).
+
+## Removed APIs
+
+| Removed                                                | Use instead                                                                                                                                                                                                                                                                     |
+| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `@tanstack/nitro-v2-vite-plugin`                       | `nitro()` from `nitro/vite`. See [Nitro hosting](./guide/hosting#nitro).                                                                                                                                                                                                        |
+| `useSession`                                           | A session library such as iron-session. See [Session Management](./guide/authentication#2-session-management). The new library cannot read existing Start session cookies: use a new cookie name and sign users in again, or test a migration that reads the old cookies first. |
+| `.inputValidator()` on server functions and middleware | `.validator()`, which takes the same validator.                                                                                                                                                                                                                                 |
+
+## Errors
+
+- A handler returned by `createStartHandler(...)` now rethrows the original error. `createServerEntry` converts errors to responses, and the built-in entry already uses it. In a custom entry, catch inside the `createServerEntry` callback and `return handleStartError(error)` or rethrow. See [Error Handling](./guide/server-entry-point#error-handling).
+- Uncaught errors produce a generic JSON body with a status from `400` to `599` (`500` by default), even if a success status was set before the error. Return a `Response` when an endpoint needs a specific error payload.
+- A server-function call rejects with whatever was thrown, including a `Response` and falsy values such as `undefined`. Return a `Response` to resolve the call with it. See [Raw Responses](./guide/server-functions#raw-responses).
+- Errors thrown by request middleware during a server-function call are sent to the client with their message, and their status is no longer always `500`.
+
+## Responses
+
+- Response helpers override the response you return or throw. `setResponseStatus(401)` followed by returning a `200` response sends `401`.
+- `setResponseHeader('set-cookie', cookie)` replaces all outgoing cookies. Use `setCookie` or `appendResponseHeader('set-cookie', cookie)` to add one.
+- `setResponseStatus` ignores codes outside `200`-`599` and warns outside production.
+- Serialized server-function replies never carry `Location`, `Content-Encoding`, or `Content-Length` from helpers, and ignore a helper `204`, `205`, or `304`. Use `redirect()` to redirect.
+
+## Requests and middleware
+
+- `getRequestHeader(name)` returns `''` for a header that is present but empty, and `undefined` only when it is missing.
+- A path with invalid percent-encoding, such as `/%E0%A4%A`, gets `400 Bad Request` before your server entry or middleware runs.
+- When no function middleware sends context, `sendContext` is `undefined` instead of `{}`.
diff --git a/docs/start/framework/react/overview.md b/docs/start/framework/react/overview.md
index 596dc77fe9..ced7b65458 100644
--- a/docs/start/framework/react/overview.md
+++ b/docs/start/framework/react/overview.md
@@ -5,9 +5,7 @@ description: Build full-stack React applications with TanStack Start, including
 ---
 
 > [!NOTE]
-> TanStack Start is currently in the **Release Candidate** stage! This means it is considered feature-complete and its API is considered stable.
-> **This does not mean it is bug-free or without issues, which is why we invite you to try it out and provide feedback!**
-> The road to v1 will likely be a quick one, so don't wait too long to try it out!
+> TanStack Start is stable. If you're upgrading from a release candidate, follow [Migrate from the Release Candidate](./migrate-from-release-candidate).
 
 TanStack Start is a full-stack React framework powered by TanStack Router. It provides a full-document SSR, streaming, server functions, client/server builds, and more. With [Vite](https://vite.dev/) and [Rsbuild](https://rsbuild.dev/) support, it's ready to develop and deploy to the hosting provider or runtime you want.
 
diff --git a/docs/start/framework/solid/guide/authentication.md b/docs/start/framework/solid/guide/authentication.md
index 4460e853ae..460a58747c 100644
--- a/docs/start/framework/solid/guide/authentication.md
+++ b/docs/start/framework/solid/guide/authentication.md
@@ -35,7 +35,7 @@ Authentication involves many considerations including password security, session
 - **Authentication**: Who is this user? (Login/logout)
 - **Authorization**: What can this user do? (Permissions/roles)
 
-TanStack Start provides the tools for both through server functions, sessions, and route protection.
+TanStack Start provides server functions, request and cookie utilities, and route protection. Session storage and authentication come from your application or a library you choose.
 
 > Protect the data/API boundary first. Any server function, server route, or other API endpoint that returns or mutates private data must authorize the request itself. `beforeLoad` is useful for route UX: it keeps users out of screens they cannot use and avoids triggering work that would fail anyway. It is not the security boundary for the data. See [Authentication Server Primitives](./authentication-server-primitives.md) for the server-side pattern.
 
@@ -48,6 +48,7 @@ Server functions handle sensitive authentication logic securely on the server:
 ```tsx
 import { createServerFn } from '@tanstack/solid-start'
 import { redirect } from '@tanstack/solid-router'
+import { getAppSession } from '~/utils/session'
 
 // Login server function
 export const loginFn = createServerFn({ method: 'POST' })
@@ -61,11 +62,9 @@ export const loginFn = createServerFn({ method: 'POST' })
     }
 
     // Create session
-    const session = await useAppSession()
-    await session.update({
-      userId: user.id,
-      email: user.email,
-    })
+    const session = await getAppSession()
+    session.userId = user.id
+    await session.save()
 
     // Redirect to protected area
     throw redirect({ to: '/dashboard' })
@@ -73,16 +72,16 @@ export const loginFn = createServerFn({ method: 'POST' })
 
 // Logout server function
 export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => {
-  const session = await useAppSession()
-  await session.clear()
+  const session = await getAppSession()
+  session.destroy()
   throw redirect({ to: '/' })
 })
 
 // Get current user
 export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler(
   async () => {
-    const session = await useAppSession()
-    const userId = session.get('userId')
+    const session = await getAppSession()
+    const userId = session.userId
 
     if (!userId) {
       return null
@@ -96,33 +95,53 @@ export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler(
 
 ### 2. Session Management
 
-TanStack Start provides secure HTTP-only cookie sessions:
+Start does not provide a session API. This guide uses iron-session for encrypted cookie sessions. Start's cookie helpers connect it to server functions, server routes, and request middleware.
+
+For encrypted cookie sessions, install [iron-session](https://github.com/vvo/iron-session):
+
+```sh
+pnpm add iron-session
+```
+
+This example uses iron-session 9's cookie adapter. Its Node runtime requires Node 22.13 or newer; check the library's runtime requirements for other deployment targets.
 
 ```tsx
-// utils/session.ts
-import { useSession } from '@tanstack/solid-start/server'
+// utils/session.ts — import only from server code
+import { getIronSession } from 'iron-session'
+import { getCookie, setCookie } from '@tanstack/solid-start/server'
 
 type SessionData = {
-  userId?: string
-  email?: string
-  role?: string
+  userId: string
+  oauthState: string
 }
 
-export function useAppSession() {
-  return useSession({
-    // Session configuration
-    name: 'app-session',
-    password: process.env.SESSION_SECRET!, // At least 32 characters
-    // Optional: customize cookie settings
-    cookie: {
-      secure: process.env.NODE_ENV === 'production',
-      sameSite: 'lax',
-      httpOnly: true,
+export function getAppSession(ttl = 7 * 24 * 60 * 60) {
+  const password = process.env.SESSION_SECRET
+  if (!password || password.length < 32) {
+    throw new Error('SESSION_SECRET must be at least 32 characters')
+  }
+
+  return getIronSession(
+    { read: getCookie, write: setCookie },
+    {
+      cookieName: 'app-session',
+      password,
+      ttl,
+      cookieOptions: {
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        httpOnly: true,
+        path: '/',
+      },
     },
-  })
+  )
 }
 ```
 
+Read fields directly from the returned session, change them, then `await session.save()` before returning or redirecting. Missing or expired sessions have no user ID. `session.destroy()` removes the browser cookie. Keep one session object for the operation; another call to `getAppSession()` reads the incoming request again. For middleware, pass that object through request context when downstream code needs the same mutations.
+
+The `getAppSession` helper belongs to your application. Start does not cache sessions, choose expiration rules, or synchronize concurrent writes. Keep secrets and session objects in server code, and read request-specific configuration inside the active request.
+
 ### 3. Authentication Context
 
 Load the current user in your root route's `beforeLoad` so the initial server render and child routes receive the same authentication state. `useServerFn` returns a callable function, not an object with `data`, `isLoading`, or `refetch`. You can call a server function directly from `beforeLoad`.
@@ -254,8 +273,9 @@ export const registerFn = createServerFn({ method: 'POST' })
     })
 
     // Create session
-    const session = await useAppSession()
-    await session.update({ userId: user.id })
+    const session = await getAppSession()
+    session.userId = user.id
+    await session.save()
 
     return { success: true, user: { id: user.id, email: user.email } }
   })
@@ -323,8 +343,9 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' })
     const state = generateRandomState()
 
     // Store state in session for CSRF protection
-    const session = await useAppSession()
-    await session.update({ oauthState: state })
+    const session = await getAppSession()
+    session.oauthState = state
+    await session.save()
 
     // Generate OAuth URL
     const authUrl = generateOAuthUrl(provider, state)
@@ -387,21 +408,9 @@ const hashedPassword = await bcrypt.hash(password, saltRounds)
 
 ### 2. Session Security
 
-```tsx
-// Use secure session configuration
-export function useAppSession() {
-  return useSession({
-    name: 'app-session',
-    password: process.env.SESSION_SECRET!, // 32+ characters
-    cookie: {
-      secure: process.env.NODE_ENV === 'production', // HTTPS only in production
-      sameSite: 'lax', // CSRF protection
-      httpOnly: true, // XSS protection
-      maxAge: 7 * 24 * 60 * 60, // 7 days
-    },
-  })
-}
-```
+Set the library's server-validated expiration as well as appropriate cookie attributes. In the iron-session example, `ttl` limits a sealed credential's lifetime from its latest save; saving again renews it. A numeric `cookieOptions.maxAge` controls browser retention. In iron-session 9, explicitly setting `maxAge: undefined` also disables seal expiry; omit the property to use the configured `ttl`. Use an application-validated timestamp or a server-side record if you also need an absolute lifetime that writes cannot extend.
+
+Use `httpOnly`, `sameSite`, and `path` deliberately, and require `secure: true` on HTTPS deployments. These cookie attributes complement server-side authorization and CSRF protections. Keep only the minimum session data and load current account permissions from their authoritative store. Logout removes a stateless cookie from the current browser; it cannot revoke a copy without server-side state.
 
 ### 3. Rate Limiting
 
@@ -581,16 +590,14 @@ export const loginFn = createServerFn({ method: 'POST' })
   )
   .handler(async ({ data }) => {
     const user = await authenticateUser(data.email, data.password)
-    if (!user) return { error: 'Invalid credentials' }
+    if (!user) {
+      return { error: 'Invalid credentials' }
+    }
 
-    const session = await useAppSession()
-    await session.update(
-      { userId: user.id },
-      {
-        // Extend session if remember me is checked
-        maxAge: data.rememberMe ? 30 * 24 * 60 * 60 : undefined, // 30 days vs session
-      },
-    )
+    const ttl = data.rememberMe ? 30 * 24 * 60 * 60 : 8 * 60 * 60
+    const session = await getAppSession(ttl)
+    session.userId = user.id
+    await session.save()
 
     return { success: true }
   })
@@ -610,7 +617,6 @@ If you're migrating from client-side authentication (localStorage, context only)
 ### From Other Frameworks
 
 - **Next.js**: Replace API routes with server functions, migrate NextAuth sessions
-- **Remix**: Convert loaders/actions to server functions, adapt session patterns
 - **SvelteKit**: Move form actions to server functions, update route protection
 
 ## Production Considerations
diff --git a/docs/start/framework/solid/migrate-from-release-candidate.md b/docs/start/framework/solid/migrate-from-release-candidate.md
new file mode 100644
index 0000000000..9f988a14fc
--- /dev/null
+++ b/docs/start/framework/solid/migrate-from-release-candidate.md
@@ -0,0 +1,8 @@
+---
+ref: docs/start/framework/react/migrate-from-release-candidate.md
+replace:
+  {
+    '@tanstack/react-start': '@tanstack/solid-start',
+    '@tanstack/react-router': '@tanstack/solid-router',
+  }
+---
diff --git a/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js
index 5f0f4fce03..954ddc026f 100644
--- a/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js
+++ b/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js
@@ -2,9 +2,5 @@ import { tanstackRouter } from '@tanstack/router-plugin/esbuild'
 
 export default {
   // ...
-  plugins: [
-    tanstackRouter({
-      autoCodeSplitting: true,
-    }),
-  ],
+  plugins: [tanstackRouter()],
 }
diff --git a/e2e/react-router/basic-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-file-based/src/routeTree.gen.ts
index 0d17f94eb0..83b504992f 100644
--- a/e2e/react-router/basic-file-based/src/routeTree.gen.ts
+++ b/e2e/react-router/basic-file-based/src/routeTree.gen.ts
@@ -1711,7 +1711,7 @@ declare module '@tanstack/react-router' {
     '/(group)/_layout': {
       id: '/(group)/_layout'
       path: ''
-      fullPath: ''
+      fullPath: '/'
       preLoaderRoute: typeof groupLayoutRouteImport
       parentRoute: typeof rootRouteImport
     }
diff --git a/e2e/react-router/basic/package.json b/e2e/react-router/basic/package.json
index 667b016896..4ff68f5cda 100644
--- a/e2e/react-router/basic/package.json
+++ b/e2e/react-router/basic/package.json
@@ -17,7 +17,8 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "redaxios": "catalog:",
-    "tailwindcss": "^4.2.2"
+    "tailwindcss": "^4.2.2",
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@playwright/test": "^1.61.0",
diff --git a/e2e/react-router/basic/src/main.tsx b/e2e/react-router/basic/src/main.tsx
index 36e5106654..49fa054776 100644
--- a/e2e/react-router/basic/src/main.tsx
+++ b/e2e/react-router/basic/src/main.tsx
@@ -1,3 +1,5 @@
+import { useState } from 'react'
+import { createPortal } from 'react-dom'
 import ReactDOM from 'react-dom/client'
 import {
   ErrorComponent,
@@ -9,12 +11,19 @@ import {
   createRouter,
   redirect,
 } from '@tanstack/react-router'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import {
+  TanStackRouterDevtoolsInProd as TanStackRouterDevtools,
+  TanStackRouterDevtoolsPanelInProd as TanStackRouterDevtoolsPanel,
+} from '@tanstack/react-router-devtools'
+import { z } from 'zod'
 import { NotFoundError, fetchPost, fetchPosts } from './posts'
 import './styles.css'
 import type { ErrorComponentProps } from '@tanstack/react-router'
 
 const rootRoute = createRootRoute({
+  validateSearch: z.object({
+    devtools: z.enum(['panel', 'shadow']).optional().catch(undefined),
+  }),
   component: RootComponent,
   notFoundComponent: () => {
     return (
@@ -27,6 +36,8 @@ const rootRoute = createRootRoute({
 })
 
 function RootComponent() {
+  const { devtools } = rootRoute.useSearch()
+
   return (
     <>
       
@@ -86,12 +97,57 @@ function RootComponent() {
+
+ Devtools: + {(['floating', 'panel', 'shadow'] as const).map((mode) => ( + ({ + ...prev, + devtools: mode === 'floating' ? undefined : mode, + })} + className={ + (devtools ?? 'floating') === mode ? 'font-bold' : undefined + } + > + {mode} + + ))} +
- + {devtools === 'panel' ? ( + + ) : devtools === 'shadow' ? ( + + ) : ( + + )} ) } + +function ShadowDevtoolsPanel() { + const [shadowRoot, setShadowRoot] = useState() + + return ( +
{ + if (host) { + setShadowRoot(host.shadowRoot ?? host.attachShadow({ mode: 'open' })) + } + }} + > + {shadowRoot + ? createPortal( + , + shadowRoot, + ) + : null} +
+ ) +} const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', diff --git a/e2e/react-router/basic/tests/devtools.spec.ts b/e2e/react-router/basic/tests/devtools.spec.ts new file mode 100644 index 0000000000..b8a7e803e6 --- /dev/null +++ b/e2e/react-router/basic/tests/devtools.spec.ts @@ -0,0 +1,42 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' + +for (const mode of ['panel', 'shadow', 'floating']) { + test(`devtools preserve typography and explorer indentation in ${mode} mode`, async ({ + page, + }) => { + await page.goto(mode === 'floating' ? '/' : `/?devtools=${mode}`) + if (mode === 'floating') { + await page + .getByRole('button', { name: 'Open TanStack Router Devtools' }) + .click() + } + + const panel = page.locator('.TanStackRouterDevtoolsPanel') + const router = panel.getByRole('button', { name: /^Router\s*\d+ items/ }) + const state = panel.getByRole('button', { name: /^state\s*\d+ items/ }) + await expect(router).toBeVisible() + await expect(state).toBeVisible() + await expect(router).toHaveCSS('font-size', '12px') + await expect(router).toHaveCSS('gap', '4px') + await expect( + panel.getByText('Pathname', { exact: true }).locator('..'), + ).toHaveCSS('padding-left', '8px') + + const routerBox = await router.boundingBox() + const stateBox = await state.boundingBox() + expect(stateBox!.x - routerBox!.x).toBe(18) + + if (mode !== 'floating') { + await page.addStyleTag({ content: ':root { font-size: 20px; }' }) + await expect(router).toHaveCSS('font-size', '15px') + await expect(router).toHaveCSS('gap', '5px') + + await page.addStyleTag({ + content: ':root { --tsrd-font-size: 24px; }', + }) + await expect(router).toHaveCSS('font-size', '18px') + await expect(router).toHaveCSS('gap', '6px') + } + }) +} diff --git a/e2e/react-router/rspack-basic-file-based/package.json b/e2e/react-router/rspack-basic-file-based/package.json index 4bff5e7801..5ec9ed9862 100644 --- a/e2e/react-router/rspack-basic-file-based/package.json +++ b/e2e/react-router/rspack-basic-file-based/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json index efd3f6e2c3..30c62d0af1 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json index 5539513ff2..f7ff609e76 100644 --- a/e2e/react-start/basic-auth/package.json +++ b/e2e/react-start/basic-auth/package.json @@ -19,6 +19,7 @@ "@tanstack/react-router": "workspace:^", "@tanstack/react-router-devtools": "workspace:^", "@tanstack/react-start": "workspace:^", + "iron-session": "^9.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "catalog:", diff --git a/e2e/react-start/basic-auth/src/routes/__root.tsx b/e2e/react-start/basic-auth/src/routes/__root.tsx index 76e5f8b1d6..fb7868435d 100644 --- a/e2e/react-start/basic-auth/src/routes/__root.tsx +++ b/e2e/react-start/basic-auth/src/routes/__root.tsx @@ -14,18 +14,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/e2e/react-start/basic-auth/src/routes/_authed.tsx b/e2e/react-start/basic-auth/src/routes/_authed.tsx index 0d87cfbacb..fe73185136 100644 --- a/e2e/react-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/react-start/basic-auth/src/routes/_authed.tsx @@ -3,7 +3,7 @@ import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,12 +37,11 @@ export const loginFn = createServerFn({ } // Create a session - const session = await useAppSession() + const session = await getAppSession() // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/react-start/basic-auth/src/routes/logout.tsx b/e2e/react-start/basic-auth/src/routes/logout.tsx index a08f9c737e..0f86b0d4e3 100644 --- a/e2e/react-start/basic-auth/src/routes/logout.tsx +++ b/e2e/react-start/basic-auth/src/routes/logout.tsx @@ -1,12 +1,12 @@ import { redirect, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() + const session = await getAppSession() - session.clear() + session.destroy() throw redirect({ href: '/', diff --git a/e2e/react-start/basic-auth/src/routes/signup.tsx b/e2e/react-start/basic-auth/src/routes/signup.tsx index 817362dc05..d7d5d40129 100644 --- a/e2e/react-start/basic-auth/src/routes/signup.tsx +++ b/e2e/react-start/basic-auth/src/routes/signup.tsx @@ -4,7 +4,7 @@ import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST', @@ -24,7 +24,7 @@ export const signupFn = createServerFn({ const password = await hashPassword(payload.password) // Create a session - const session = await useAppSession() + const session = await getAppSession() if (found) { if (found.password !== password) { @@ -36,9 +36,8 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -55,9 +54,8 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/e2e/react-start/basic-auth/src/utils/session.ts b/e2e/react-start/basic-auth/src/utils/session.ts index c38bac1e48..f1deacf85b 100644 --- a/e2e/react-start/basic-auth/src/utils/session.ts +++ b/e2e/react-start/basic-auth/src/utils/session.ts @@ -1,13 +1,25 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/react-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'test-auth-session', + // This fixture only runs locally with test credentials. + password: 'local-e2e-only-session-password-at-least-32-characters', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } diff --git a/e2e/react-start/basic-cloudflare/tests/app.spec.ts b/e2e/react-start/basic-cloudflare/tests/app.spec.ts index add28cb73e..c9497070dd 100644 --- a/e2e/react-start/basic-cloudflare/tests/app.spec.ts +++ b/e2e/react-start/basic-cloudflare/tests/app.spec.ts @@ -1,3 +1,5 @@ +import { execFileSync } from 'node:child_process' +import { fileURLToPath } from 'node:url' import { existsSync } from 'node:fs' import { join } from 'node:path' import { expect } from '@playwright/test' @@ -29,3 +31,19 @@ test('prerender with Cloudflare Workers runtime', async ({ page }) => { 'The value is Hello from Cloudflare', ) }) + +test('the built Cloudflare app passes a deployment dry run', () => { + const wrangler = fileURLToPath( + new URL('../node_modules/wrangler/bin/wrangler.js', import.meta.url), + ) + const output = execFileSync( + process.execPath, + [wrangler, 'deploy', '--dry-run'], + { + encoding: 'utf8', + env: { ...process.env, WRANGLER_SEND_METRICS: 'false' }, + }, + ) + expect(output).toContain('dist/server/wrangler.json') + expect(output).toContain('--dry-run: exiting now.') +}) diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json index 56af87c1bf..ee37b82ba6 100644 --- a/e2e/react-start/basic-react-query/package.json +++ b/e2e/react-start/basic-react-query/package.json @@ -32,7 +32,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json index b3367d05d4..99e681ac9d 100644 --- a/e2e/react-start/basic-tsr-config/package.json +++ b/e2e/react-start/basic-tsr-config/package.json @@ -21,7 +21,7 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index a729a0d532..3a1a4ea9c8 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -22,6 +22,7 @@ "@tanstack/react-start": "workspace:^", "express": "^5.2.1", "http-proxy-middleware": "^3.0.5", + "iron-session": "^9.0.1", "js-cookie": "^3.0.5", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -30,7 +31,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", @@ -41,7 +42,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", @@ -49,6 +50,18 @@ "zod": "^4.4.3" }, "nx": { + "targets": { + "test:e2e--vite-spa--dev": { + "dependsOn": [ + "^build" + ] + }, + "test:e2e--rsbuild-spa--dev": { + "dependsOn": [ + "^build" + ] + } + }, "metadata": { "playwrightModes": [ { @@ -59,6 +72,14 @@ "toolchain": "vite", "mode": "spa" }, + { + "toolchain": "vite", + "mode": "spa", + "name": "dev", + "env": { + "E2E_DEV_SERVER": "true" + } + }, { "toolchain": "vite", "mode": "prerender", @@ -86,6 +107,14 @@ "toolchain": "rsbuild", "mode": "spa" }, + { + "toolchain": "rsbuild", + "mode": "spa", + "name": "dev", + "env": { + "E2E_DEV_SERVER": "true" + } + }, { "toolchain": "rsbuild", "mode": "prerender", diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index bdf5fd74ca..bb4c2cb761 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -5,6 +5,8 @@ const mode = process.env.MODE ?? 'ssr' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const distDir = process.env.E2E_DIST_DIR ?? 'dist' +// The dev runs start the dev server and run only the SPA shell spec +const devServer = process.env.E2E_DEV_SERVER === 'true' const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` @@ -12,12 +14,26 @@ const previewCommand = toolchain === 'rsbuild' ? `pnpm preview:rsbuild --host 0.0.0.0 --port ${PORT}` : `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` -const commandByMode = mode === 'preview' ? previewCommand : 'pnpm start' +const devCommand = + toolchain === 'rsbuild' + ? `pnpm dev:rsbuild --port ${PORT}` + : `pnpm dev:vite --port ${PORT}` +const commandByMode = devServer + ? devCommand + : mode === 'preview' + ? previewCommand + : 'pnpm start' /** * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ testDir: './tests', + ...(devServer + ? { + testMatch: 'spa-shell.spec.ts', + globalSetup: './tests/setup/dev-server.setup.ts', + } + : {}), workers: 1, reporter: [['line']], diff --git a/e2e/react-start/basic/src/routeTree.gen.ts b/e2e/react-start/basic/src/routeTree.gen.ts index d5416aa352..b6603dd01d 100644 --- a/e2e/react-start/basic/src/routeTree.gen.ts +++ b/e2e/react-start/basic/src/routeTree.gen.ts @@ -15,6 +15,8 @@ import { Route as AsyncScriptsRouteImport } from './routes/async-scripts' import { Route as AuthDocsRouteImport } from './routes/auth-docs' import { Route as ClientOnlyRouteImport } from './routes/client-only' import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as ExecutionLocalRouteImport } from './routes/execution-local' +import { Route as ExecutionRpcRouteImport } from './routes/execution-rpc' import { Route as InlineScriptsRouteImport } from './routes/inline-scripts' import { Route as LinksRouteImport } from './routes/links' import { Route as NotFoundRouteRouteImport } from './routes/not-found/route' @@ -113,6 +115,16 @@ const DeferredRoute = DeferredRouteImport.update({ path: '/deferred', getParentRoute: () => rootRouteImport, } as any) +const ExecutionLocalRoute = ExecutionLocalRouteImport.update({ + id: '/execution-local', + path: '/execution-local', + getParentRoute: () => rootRouteImport, +} as any) +const ExecutionRpcRoute = ExecutionRpcRouteImport.update({ + id: '/execution-rpc', + path: '/execution-rpc', + getParentRoute: () => rootRouteImport, +} as any) const InlineScriptsRoute = InlineScriptsRouteImport.update({ id: '/inline-scripts', path: '/inline-scripts', @@ -479,6 +491,8 @@ export interface FileRoutesByFullPath { '/auth-docs': typeof AuthDocsRouteWithChildren '/client-only': typeof ClientOnlyRoute '/deferred': typeof DeferredRoute + '/execution-local': typeof ExecutionLocalRoute + '/execution-rpc': typeof ExecutionRpcRoute '/inline-scripts': typeof InlineScriptsRoute '/links': typeof LinksRoute '/plain-ts-type-assertion': typeof PlainTsTypeAssertionRoute @@ -551,6 +565,8 @@ export interface FileRoutesByTo { '/auth-docs': typeof AuthDocsRouteWithChildren '/client-only': typeof ClientOnlyRoute '/deferred': typeof DeferredRoute + '/execution-local': typeof ExecutionLocalRoute + '/execution-rpc': typeof ExecutionRpcRoute '/inline-scripts': typeof InlineScriptsRoute '/links': typeof LinksRoute '/plain-ts-type-assertion': typeof PlainTsTypeAssertionRoute @@ -620,6 +636,8 @@ export interface FileRoutesById { '/auth-docs': typeof AuthDocsRouteWithChildren '/client-only': typeof ClientOnlyRoute '/deferred': typeof DeferredRoute + '/execution-local': typeof ExecutionLocalRoute + '/execution-rpc': typeof ExecutionRpcRoute '/inline-scripts': typeof InlineScriptsRoute '/links': typeof LinksRoute '/plain-ts-type-assertion': typeof PlainTsTypeAssertionRoute @@ -697,6 +715,8 @@ export interface FileRouteTypes { | '/auth-docs' | '/client-only' | '/deferred' + | '/execution-local' + | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -769,6 +789,8 @@ export interface FileRouteTypes { | '/auth-docs' | '/client-only' | '/deferred' + | '/execution-local' + | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -837,6 +859,8 @@ export interface FileRouteTypes { | '/auth-docs' | '/client-only' | '/deferred' + | '/execution-local' + | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -914,6 +938,8 @@ export interface RootRouteChildren { AuthDocsRoute: typeof AuthDocsRouteWithChildren ClientOnlyRoute: typeof ClientOnlyRoute DeferredRoute: typeof DeferredRoute + ExecutionLocalRoute: typeof ExecutionLocalRoute + ExecutionRpcRoute: typeof ExecutionRpcRoute InlineScriptsRoute: typeof InlineScriptsRoute LinksRoute: typeof LinksRoute PlainTsTypeAssertionRoute: typeof PlainTsTypeAssertionRoute @@ -979,6 +1005,20 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRouteImport } + '/execution-local': { + id: '/execution-local' + path: '/execution-local' + fullPath: '/execution-local' + preLoaderRoute: typeof ExecutionLocalRouteImport + parentRoute: typeof rootRouteImport + } + '/execution-rpc': { + id: '/execution-rpc' + path: '/execution-rpc' + fullPath: '/execution-rpc' + preLoaderRoute: typeof ExecutionRpcRouteImport + parentRoute: typeof rootRouteImport + } '/inline-scripts': { id: '/inline-scripts' path: '/inline-scripts' @@ -1729,6 +1769,8 @@ const rootRouteChildren: RootRouteChildren = { AuthDocsRoute: AuthDocsRouteWithChildren, ClientOnlyRoute: ClientOnlyRoute, DeferredRoute: DeferredRoute, + ExecutionLocalRoute: ExecutionLocalRoute, + ExecutionRpcRoute: ExecutionRpcRoute, InlineScriptsRoute: InlineScriptsRoute, LinksRoute: LinksRoute, PlainTsTypeAssertionRoute: PlainTsTypeAssertionRoute, diff --git a/e2e/react-start/basic/src/routes/__root.tsx b/e2e/react-start/basic/src/routes/__root.tsx index d8fc0d3b24..ed521817d6 100644 --- a/e2e/react-start/basic/src/routes/__root.tsx +++ b/e2e/react-start/basic/src/routes/__root.tsx @@ -197,6 +197,9 @@ function RootDocument({ children }: { children: React.ReactNode }) { > Client Only {' '} + + Server function loader + {' '} readOnlyOnServer(), + component: Result, + errorComponent: ({ error }) => ( +

{error instanceof Error ? error.message : String(error)}

+ ), +}) + +function Result() { + return

{Route.useLoaderData()}

+} diff --git a/e2e/react-start/basic/src/routes/execution-rpc.tsx b/e2e/react-start/basic/src/routes/execution-rpc.tsx new file mode 100644 index 0000000000..f934015522 --- /dev/null +++ b/e2e/react-start/basic/src/routes/execution-rpc.tsx @@ -0,0 +1,18 @@ +import { createFileRoute, Link } from '@tanstack/react-router' +import { readThroughRpc } from '~/utils/execution-functions' + +export const Route = createFileRoute('/execution-rpc')({ + loader: () => readThroughRpc(), + component: Result, +}) + +function Result() { + return ( + <> +

{Route.useLoaderData()}

+ + Call the server-only helper directly + + + ) +} diff --git a/e2e/react-start/basic/src/utils/auth-docs.ts b/e2e/react-start/basic/src/utils/auth-docs.ts index c5f0f11645..22b36ee808 100644 --- a/e2e/react-start/basic/src/utils/auth-docs.ts +++ b/e2e/react-start/basic/src/utils/auth-docs.ts @@ -1,18 +1,29 @@ import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' -import { useSession } from '@tanstack/react-start/server' +import { getCookie, setCookie } from '@tanstack/react-start/server' +import { getIronSession } from 'iron-session' function getSession() { - return useSession<{ email?: string }>({ - name: 'auth-docs-test', - password: 'authentication-docs-browser-test-secret-only-2026', - }) + return getIronSession<{ email: string }>( + { read: getCookie, write: setCookie }, + { + cookieName: 'auth-docs-test', + password: 'authentication-docs-browser-test-secret-only-2026', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( async () => { const session = await getSession() - return session.data.email ? { email: session.data.email } : null + return session.email ? { email: session.email } : null }, ) @@ -27,20 +38,21 @@ export const loginFn = createServerFn({ method: 'POST' }) return { error: 'Invalid credentials' } } const session = await getSession() - await session.update({ email: data.email }) + session.email = data.email + await session.save() throw redirect({ to: '/auth-docs/private' }) }) export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { const session = await getSession() - await session.clear() + session.destroy() throw redirect({ to: '/auth-docs' }) }) export const getPrivateDataFn = createServerFn({ method: 'GET' }).handler( async () => { const session = await getSession() - if (!session.data.email) { + if (!session.email) { throw new Error('Unauthorized') } return 'Private account data' diff --git a/e2e/react-start/basic/src/utils/execution-functions.ts b/e2e/react-start/basic/src/utils/execution-functions.ts new file mode 100644 index 0000000000..97e66573d8 --- /dev/null +++ b/e2e/react-start/basic/src/utils/execution-functions.ts @@ -0,0 +1,5 @@ +import { createServerFn, createServerOnlyFn } from '@tanstack/react-start' + +export const readOnlyOnServer = createServerOnlyFn(() => 'Read on the server') + +export const readThroughRpc = createServerFn().handler(() => readOnlyOnServer()) diff --git a/e2e/react-start/basic/tests/client-only.spec.ts b/e2e/react-start/basic/tests/client-only.spec.ts index a3b6f99442..299744f636 100644 --- a/e2e/react-start/basic/tests/client-only.spec.ts +++ b/e2e/react-start/basic/tests/client-only.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { isSpaMode } from './utils/isSpaMode' /** * These tests verify the compiler optimization. @@ -15,7 +16,15 @@ import { test } from '@tanstack/router-e2e-utils' test('ClientOnly renders fallback on server, then client content after hydration', async ({ page, + request, }) => { + const response = await request.get('/client-only') + expect(response.status()).toBe(200) + const html = await response.text() + expect(html).not.toContain('data-testid="window-size"') + if (!isSpaMode) { + expect(html).toContain('Loading window size...') + } // Navigate directly to the client-only route // If the compiler optimization isn't working, this would crash the server // because WindowSize.tsx accesses `window` at module scope diff --git a/e2e/react-start/basic/tests/environment-functions.spec.ts b/e2e/react-start/basic/tests/environment-functions.spec.ts new file mode 100644 index 0000000000..410b1d999e --- /dev/null +++ b/e2e/react-start/basic/tests/environment-functions.spec.ts @@ -0,0 +1,46 @@ +import { expect, test } from '@playwright/test' +import { isSpaMode } from './utils/isSpaMode' + +const guardError = + 'createServerOnlyFn() functions can only be called on the server!' + +test('a server-only loader works on the server but rejects client navigation', async ({ + page, + request, +}) => { + const direct = await request.get('/execution-local') + expect(direct.status()).toBe(200) + if (!isSpaMode) { + expect(await direct.text()).toContain('Read on the server') + } + await page.goto('/execution-rpc') + await expect(page.getByTestId('execution-result')).toHaveText( + 'Read on the server', + ) + await page + .getByRole('link', { name: 'Call the server-only helper directly' }) + .click() + await expect(page.getByRole('alert')).toHaveText(guardError) +}) + +test('a server function preserves the loader result on direct requests and navigation', async ({ + page, + request, +}) => { + const direct = await request.get('/execution-rpc') + expect(direct.status()).toBe(200) + if (!isSpaMode) { + expect(await direct.text()).toContain('Read on the server') + } + await page.goto('/') + await page + .getByRole('link', { name: 'Server function loader', exact: true }) + .click() + await expect(page.getByTestId('execution-result')).toHaveText( + 'Read on the server', + ) + await page.reload() + await expect(page.getByTestId('execution-result')).toHaveText( + 'Read on the server', + ) +}) diff --git a/e2e/react-start/basic/tests/setup/dev-server.setup.ts b/e2e/react-start/basic/tests/setup/dev-server.setup.ts new file mode 100644 index 0000000000..d16ff0bb54 --- /dev/null +++ b/e2e/react-start/basic/tests/setup/dev-server.setup.ts @@ -0,0 +1,19 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + warmup: async (page) => { + await page.getByRole('heading').getByText('Welcome Home').waitFor() + await page.goto(`${baseURL}/specialChars/search?searchParam=warmup`) + await page.getByTestId('special-search-loaded-info').waitFor() + await page.goto(`${baseURL}/posts`) + await page.getByRole('link', { name: 'sunt aut facere repe' }).waitFor() + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/react-start/basic/tests/spa-shell.spec.ts b/e2e/react-start/basic/tests/spa-shell.spec.ts new file mode 100644 index 0000000000..f42195e762 --- /dev/null +++ b/e2e/react-start/basic/tests/spa-shell.spec.ts @@ -0,0 +1,53 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import { isSpaMode } from './utils/isSpaMode' + +// The prod SPA run and the dev SPA runs (`E2E_DEV_SERVER`) all run this file. +// The dev runs run nothing else. +test.skip(!isSpaMode, 'only SPA mode answers documents with the shell') + +// Its loader and beforeLoad report where they ran. +const searchRoute = '/specialChars/search?searchParam=shell' + +test('a document request gets the shell, not the rendered route', async ({ + request, +}) => { + const response = await request.get(searchRoute) + + expect(response.status()).toBe(200) + const html = await response.text() + // The root route's document renders... + expect(html).toContain('This Route Does Not Exist') + // ...but not the matched route, nor its loader's output. + expect(html).not.toContain('special-search-loaded-info') + expect(html).not.toContain('Loaded on: server') +}) + +test('the route loads in the browser', async ({ page }) => { + await page.goto(searchRoute) + + await expect(page.getByTestId('special-search-loaded-info')).toHaveText( + 'Loaded on: client', + ) + await expect(page.getByTestId('special-search-before-load-info')).toHaveText( + 'Before load on: client', + ) + await expect(page.getByTestId('special-search-param')).toHaveText('shell') +}) + +test('client navigation works from the shell', async ({ page }) => { + await page.goto('/') + await expect(page.getByRole('heading')).toContainText('Welcome Home') + await expect(page.getByTestId('router-status')).toHaveText('idle') + + // A full page load would drop this. + await page.evaluate(() => { + ;(window as any).__spaShellPage = true + }) + await page.getByRole('link', { name: 'Posts' }).click() + await page.waitForURL('/posts') + await expect( + page.getByRole('link', { name: 'sunt aut facere repe' }), + ).toBeVisible() + expect(await page.evaluate(() => (window as any).__spaShellPage)).toBe(true) +}) diff --git a/e2e/react-start/csp/package.json b/e2e/react-start/csp/package.json index 341afdf406..fd8987bcef 100644 --- a/e2e/react-start/csp/package.json +++ b/e2e/react-start/csp/package.json @@ -22,7 +22,7 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/css-inline/package.json b/e2e/react-start/css-inline/package.json index 02371eab4e..6c5dd031c6 100644 --- a/e2e/react-start/css-inline/package.json +++ b/e2e/react-start/css-inline/package.json @@ -20,11 +20,11 @@ "express": "^5.2.1", "react": "^19.0.0", "react-dom": "^19.0.0", - "srvx": "^0.11.9" + "srvx": "^1.0.0" }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", diff --git a/e2e/react-start/css-modules/.gitignore b/e2e/react-start/css-modules/.gitignore index 229709a89d..a1fbca128d 100644 --- a/e2e/react-start/css-modules/.gitignore +++ b/e2e/react-start/css-modules/.gitignore @@ -3,3 +3,4 @@ dist test-results playwright-report port*.txt +.cloudflare diff --git a/e2e/react-start/css-modules/cloudflare.config.ts b/e2e/react-start/css-modules/cloudflare.config.ts new file mode 100644 index 0000000000..e2bd5e13f1 --- /dev/null +++ b/e2e/react-start/css-modules/cloudflare.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'cf/config' + +// Used by rsbuild-plugin-cloudflare (E2E_RSBUILD_CLOUDFLARE=true). +// The Vite Cloudflare variant still reads wrangler.jsonc. +export default defineConfig({ + worker: { + name: 'tanstack-start-css-modules', + entrypoint: '@tanstack/react-start/server-entry', + compatibilityDate: '2026-11-01', + }, +}) diff --git a/e2e/react-start/css-modules/package.json b/e2e/react-start/css-modules/package.json index 29f5b919ea..25c11d7321 100644 --- a/e2e/react-start/css-modules/package.json +++ b/e2e/react-start/css-modules/package.json @@ -12,6 +12,8 @@ "dev:e2e:basepath": "VITE_BASE_PATH=/my-app vite dev --port $PORT", "dev:cloudflare": "echo 'Cloudflare dev mode has React duplication issues - use build+preview instead' && exit 1", "dev:e2e:cloudflare": "echo 'Cloudflare dev mode has React duplication issues - use build+preview instead' && exit 1", + "dev:e2e:rsbuild": "rsbuild dev --port $PORT", + "dev:e2e:rsbuild-cloudflare": "E2E_RSBUILD_CLOUDFLARE=true rsbuild dev --port $PORT", "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", @@ -19,13 +21,16 @@ "test:e2e:dev:nitro": "MODE=dev VITE_CONFIG=nitro playwright test --project=chromium", "test:e2e:dev:basepath": "MODE=dev VITE_CONFIG=basepath playwright test --project=chromium", "_test:e2e:dev:cloudflare": "MODE=dev VITE_CONFIG=cloudflare playwright test --project=chromium", + "test:e2e:dev:rsbuild": "MODE=dev VITE_CONFIG=rsbuild playwright test --project=chromium", + "test:e2e:dev:rsbuild-cloudflare": "MODE=dev VITE_CONFIG=rsbuild-cloudflare playwright test --project=chromium", "test:e2e:prod:default": "MODE=prod playwright test --project=chromium", "test:e2e:prod": "pnpm run test:e2e:prod:default && pnpm run test:e2e:prod:css-code-split-false", "test:e2e:prod:css-code-split-false": "MODE=prod VITE_CSS_CODE_SPLIT=false playwright test tests/css.prod.spec.ts --project=chromium", "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod", "test:e2e:nitro": "pnpm run test:e2e:dev:nitro", "test:e2e:basepath": "pnpm run test:e2e:dev:basepath", - "_test:e2e:cloudflare": "echo 'Cloudflare dev mode disabled - React duplication issues' && exit 0" + "_test:e2e:cloudflare": "echo 'Cloudflare dev mode disabled - React duplication issues' && exit 0", + "build:rsbuild": "rsbuild build && tsc --noEmit" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -36,17 +41,36 @@ "devDependencies": { "@cloudflare/vite-plugin": "^1.29.0", "@playwright/test": "^1.61.0", + "@rsbuild/core": "^2.3.1", + "@rsbuild/plugin-react": "^2.0.0", + "@rsbuild/plugin-sass": "^2.0.1", "@tanstack/router-e2e-utils": "workspace:*", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", - "sass": "^1.97.2", - "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", + "@vitejs/plugin-react": "^6.0.1", + "cf": "1.0.0-beta.28", + "nitro": "^3.0.260903-beta", + "rsbuild-plugin-cloudflare": "^0.0.4", + "sass": "^1.97.2", + "srvx": "^1.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "wrangler": "^4.74.0" + }, + "nx": { + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } } } diff --git a/e2e/react-start/css-modules/playwright.config.ts b/e2e/react-start/css-modules/playwright.config.ts index fa55e9d054..7e7ad3d9b3 100644 --- a/e2e/react-start/css-modules/playwright.config.ts +++ b/e2e/react-start/css-modules/playwright.config.ts @@ -3,6 +3,7 @@ import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' +const distDir = process.env.E2E_DIST_DIR const viteConfig = process.env.VITE_CONFIG // 'nitro' | 'basepath' | 'cloudflare' | undefined const PORT = Number(process.env.E2E_APP_PORT ?? 0) @@ -17,6 +18,7 @@ const devCommand = viteConfig export default defineConfig({ testDir: './tests', + testMatch: isDev ? '**/*.dev.spec.ts' : '**/*.prod.spec.ts', workers: 1, reporter: [['line']], @@ -27,7 +29,11 @@ export default defineConfig({ }, webServer: { - command: isDev ? devCommand : `pnpm build && PORT=${PORT} pnpm start`, + command: isDev + ? devCommand + : distDir + ? `pnpm exec srvx --prod --dir=. -s ${distDir}/client --entry ${distDir}/server/server.js` + : `pnpm build && PORT=${PORT} pnpm start`, wait: appServerReady, reuseExistingServer: false, stdout: 'pipe', diff --git a/e2e/react-start/css-modules/rsbuild.config.ts b/e2e/react-start/css-modules/rsbuild.config.ts new file mode 100644 index 0000000000..499ed67ebc --- /dev/null +++ b/e2e/react-start/css-modules/rsbuild.config.ts @@ -0,0 +1,63 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { pluginSass } from '@rsbuild/plugin-sass' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' +import { cloudflare } from 'rsbuild-plugin-cloudflare' + +// E2E_RSBUILD_CLOUDFLARE: Set to 'true' to run the SSR environment in workerd +const useCloudflare = process.env.E2E_RSBUILD_CLOUDFLARE === 'true' + +export default defineConfig({ + plugins: [ + pluginReact(), + pluginSass(), + ...(useCloudflare + ? [ + cloudflare({ + rsbuildEnvironment: { name: 'ssr' }, + inspectorPort: false, + }), + ] + : []), + tanstackStart(), + ], + output: { + distPath: { + root: process.env.E2E_DIST_DIR ?? 'dist-rsbuild-ssr', + }, + }, + tools: { + rspack(config, { environment }) { + if (environment.name === 'ssr') { + config.output ??= {} + config.output.filename = 'server.js' + } + if (environment.name !== 'client') { + return + } + config.optimization ??= {} + // Extract the shared component and its helper into their own chunks so + // a route depends on a shared chunk that depends on another shared chunk. + config.optimization.splitChunks = { + cacheGroups: { + sharedHeader: { + test: /[\\/]src[\\/]components[\\/]/, + chunks: 'async', + minChunks: 2, + minSize: 0, + enforce: true, + name: 'shared-header', + }, + sharedFormat: { + test: /[\\/]src[\\/]utils[\\/]/, + chunks: 'async', + minChunks: 2, + minSize: 0, + enforce: true, + name: 'shared-format', + }, + }, + } + }, + }, +}) diff --git a/e2e/react-start/css-modules/src/components/Header.module.css b/e2e/react-start/css-modules/src/components/Header.module.css new file mode 100644 index 0000000000..e6878a5410 --- /dev/null +++ b/e2e/react-start/css-modules/src/components/Header.module.css @@ -0,0 +1,14 @@ +.header { + --repro-shared-header: 1; + display: grid; + grid-template-columns: minmax(0, 1fr) auto; + align-items: center; + height: 64px; + padding-inline: 16px; + background: #e4f2e9; +} + +.header h1 { + margin: 0; + font-size: 24px; +} diff --git a/e2e/react-start/css-modules/src/components/Header.tsx b/e2e/react-start/css-modules/src/components/Header.tsx new file mode 100644 index 0000000000..f16b12e8ff --- /dev/null +++ b/e2e/react-start/css-modules/src/components/Header.tsx @@ -0,0 +1,11 @@ +import { formatTitle } from '../utils/formatTitle' +import styles from './Header.module.css' + +export function Header({ title }: { title: string }) { + return ( +
+

{formatTitle(title)}

+ +
+ ) +} diff --git a/e2e/react-start/css-modules/src/routeTree.gen.ts b/e2e/react-start/css-modules/src/routeTree.gen.ts index 822118990d..2789a3490a 100644 --- a/e2e/react-start/css-modules/src/routeTree.gen.ts +++ b/e2e/react-start/css-modules/src/routeTree.gen.ts @@ -10,6 +10,9 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' +import { Route as AlphaRouteImport } from './routes/alpha' +import { Route as BetaRouteImport } from './routes/beta' +import { Route as GammaRouteImport } from './routes/gamma' import { Route as ModulesRouteImport } from './routes/modules' import { Route as QuotesRouteImport } from './routes/quotes' import { Route as SassMixinRouteImport } from './routes/sass-mixin' @@ -19,6 +22,21 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) +const AlphaRoute = AlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => rootRouteImport, +} as any) +const BetaRoute = BetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => rootRouteImport, +} as any) +const GammaRoute = GammaRouteImport.update({ + id: '/gamma', + path: '/gamma', + getParentRoute: () => rootRouteImport, +} as any) const ModulesRoute = ModulesRouteImport.update({ id: '/modules', path: '/modules', @@ -37,12 +55,18 @@ const SassMixinRoute = SassMixinRouteImport.update({ export interface FileRoutesByFullPath { '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute } export interface FileRoutesByTo { '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute @@ -50,20 +74,36 @@ export interface FileRoutesByTo { export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/modules' | '/quotes' | '/sass-mixin' + fullPaths: + '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' fileRoutesByTo: FileRoutesByTo - to: '/' | '/modules' | '/quotes' | '/sass-mixin' - id: '__root__' | '/' | '/modules' | '/quotes' | '/sass-mixin' + to: + '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' + id: + | '__root__' + | '/' + | '/alpha' + | '/beta' + | '/gamma' + | '/modules' + | '/quotes' + | '/sass-mixin' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute + AlphaRoute: typeof AlphaRoute + BetaRoute: typeof BetaRoute + GammaRoute: typeof GammaRoute ModulesRoute: typeof ModulesRoute QuotesRoute: typeof QuotesRoute SassMixinRoute: typeof SassMixinRoute @@ -78,6 +118,27 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/alpha': { + id: '/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof AlphaRouteImport + parentRoute: typeof rootRouteImport + } + '/beta': { + id: '/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof BetaRouteImport + parentRoute: typeof rootRouteImport + } + '/gamma': { + id: '/gamma' + path: '/gamma' + fullPath: '/gamma' + preLoaderRoute: typeof GammaRouteImport + parentRoute: typeof rootRouteImport + } '/modules': { id: '/modules' path: '/modules' @@ -104,6 +165,9 @@ declare module '@tanstack/react-router' { const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, + AlphaRoute: AlphaRoute, + BetaRoute: BetaRoute, + GammaRoute: GammaRoute, ModulesRoute: ModulesRoute, QuotesRoute: QuotesRoute, SassMixinRoute: SassMixinRoute, diff --git a/e2e/react-start/css-modules/src/routes/alpha.tsx b/e2e/react-start/css-modules/src/routes/alpha.tsx new file mode 100644 index 0000000000..e894cd758f --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/alpha.tsx @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { Header } from '../components/Header' +import styles from '../styles/alpha.module.css' + +export const Route = createFileRoute('/alpha')({ component: Alpha }) + +function Alpha() { + return ( +
+
+
+ ) +} diff --git a/e2e/react-start/css-modules/src/routes/beta.tsx b/e2e/react-start/css-modules/src/routes/beta.tsx new file mode 100644 index 0000000000..4f139ac41a --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/beta.tsx @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { Header } from '../components/Header' +import styles from '../styles/beta.module.css' + +export const Route = createFileRoute('/beta')({ component: Beta }) + +function Beta() { + return ( +
+
+
+ ) +} diff --git a/e2e/react-start/css-modules/src/routes/gamma.tsx b/e2e/react-start/css-modules/src/routes/gamma.tsx new file mode 100644 index 0000000000..a8e036b85f --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/gamma.tsx @@ -0,0 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' +import { formatTitle } from '../utils/formatTitle' + +export const Route = createFileRoute('/gamma')({ component: Gamma }) + +function Gamma() { + return
{formatTitle('Gamma')}
+} diff --git a/e2e/react-start/css-modules/src/styles/alpha.module.css b/e2e/react-start/css-modules/src/styles/alpha.module.css new file mode 100644 index 0000000000..12a606a8d3 --- /dev/null +++ b/e2e/react-start/css-modules/src/styles/alpha.module.css @@ -0,0 +1,4 @@ +.page { + --repro-alpha: 1; + border: 4px solid #226844; +} diff --git a/e2e/react-start/css-modules/src/styles/beta.module.css b/e2e/react-start/css-modules/src/styles/beta.module.css new file mode 100644 index 0000000000..719686a76b --- /dev/null +++ b/e2e/react-start/css-modules/src/styles/beta.module.css @@ -0,0 +1,4 @@ +.page { + --repro-beta: 1; + border: 4px solid #ac344c; +} diff --git a/e2e/react-start/css-modules/src/utils/formatTitle.ts b/e2e/react-start/css-modules/src/utils/formatTitle.ts new file mode 100644 index 0000000000..d0325ac63e --- /dev/null +++ b/e2e/react-start/css-modules/src/utils/formatTitle.ts @@ -0,0 +1,3 @@ +export function formatTitle(title: string) { + return `${title} (repro-format-title)` +} diff --git a/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts b/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts new file mode 100644 index 0000000000..9a9595f819 --- /dev/null +++ b/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts @@ -0,0 +1,94 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { Page } from '@playwright/test' + +test.skip( + process.env.VITE_CSS_CODE_SPLIT === 'false', + 'Route stylesheet isolation requires CSS code splitting', +) +test.use({ javaScriptEnabled: false }) + +async function getStylesheetContent(page: Page) { + const hrefs = await page + .locator('link[rel="stylesheet"]') + .evaluateAll((links: Array) => + links.map((link) => link.href), + ) + expect(hrefs.length).toBeGreaterThan(0) + const stylesheets = await Promise.all( + hrefs.map(async (href) => { + const response = await page.request.get(href) + expect(response.ok()).toBe(true) + return response.text() + }), + ) + return stylesheets.join('\n') +} + +for (const route of ['alpha', 'beta']) { + test(`${route} has complete and isolated CSS without JavaScript`, async ({ + page, + }) => { + await page.goto(`/${route}`) + + const header = page.getByTestId('shared-header') + await expect(header).toHaveCSS('display', 'grid') + await expect(header).toHaveCSS('height', '64px') + await expect(page.getByTestId('route-page')).toHaveCSS( + `--repro-${route}`, + '1', + ) + + const css = await getStylesheetContent(page) + expect(css).toContain('--repro-shared-header') + expect(css).toContain(`--repro-${route}`) + expect(css).not.toContain(`--repro-${route === 'alpha' ? 'beta' : 'alpha'}`) + }) +} + +function getScriptPreloadHrefs(html: string) { + return Array.from(html.matchAll(/]*>/g), (match) => match[0]) + .filter( + (tag) => + /\brel="modulepreload"/.test(tag) || + (/\brel="preload"/.test(tag) && /\bas="script"/.test(tag)), + ) + .map((tag) => tag.match(/\bhref="([^"]+)"/)?.[1]) + .filter((href): href is string => !!href) +} + +test('alpha preloads the shared header chunk and the chunk it depends on', async ({ + page, +}) => { + const response = await page.request.get('/alpha') + expect(response.ok()).toBe(true) + + const hrefs = getScriptPreloadHrefs(await response.text()) + expect(hrefs.length).toBeGreaterThan(0) + + const scripts = await Promise.all( + hrefs.map(async (href) => { + const script = await page.request.get(href) + expect(script.ok()).toBe(true) + return script.text() + }), + ) + + expect(scripts.some((code) => code.includes('shared-header'))).toBe(true) + expect(scripts.some((code) => code.includes('repro-format-title'))).toBe(true) +}) + +test('home does not load the shared header or route styles', async ({ + page, +}) => { + await page.goto('/') + await expect(page.getByTestId('global-styled')).toHaveCSS( + 'background-color', + 'rgb(59, 130, 246)', + ) + + const css = await getStylesheetContent(page) + expect(css).not.toContain('--repro-shared-header') + expect(css).not.toContain('--repro-alpha') + expect(css).not.toContain('--repro-beta') +}) diff --git a/e2e/react-start/css-modules/vite.config.ts b/e2e/react-start/css-modules/vite.config.ts index 9923ab3384..c9c27f7f9a 100644 --- a/e2e/react-start/css-modules/vite.config.ts +++ b/e2e/react-start/css-modules/vite.config.ts @@ -21,6 +21,7 @@ export default defineConfig(async () => { port: 3000, }, build: { + outDir: process.env.E2E_DIST_DIR ?? 'dist', cssCodeSplit, }, plugins: [ diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json index 45d39c3bbf..e93949eea2 100644 --- a/e2e/react-start/custom-basepath/package.json +++ b/e2e/react-start/custom-basepath/package.json @@ -29,7 +29,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json index de1a118d60..1c5b3af393 100644 --- a/e2e/react-start/custom-server-rsbuild/package.json +++ b/e2e/react-start/custom-server-rsbuild/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", @@ -30,7 +30,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/deferred-hydration/package.json b/e2e/react-start/deferred-hydration/package.json index b5a8a85a09..5a33407435 100644 --- a/e2e/react-start/deferred-hydration/package.json +++ b/e2e/react-start/deferred-hydration/package.json @@ -26,14 +26,14 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/dev-ssr-styles/package.json b/e2e/react-start/dev-ssr-styles/package.json index 2c60f8576a..a5300e836e 100644 --- a/e2e/react-start/dev-ssr-styles/package.json +++ b/e2e/react-start/dev-ssr-styles/package.json @@ -22,13 +22,9 @@ "test:e2e:dev:nitro": "MODE=dev VITE_USE_NITRO=true playwright test --project=chromium", "test:e2e:dev:disabled:nitro": "MODE=dev SSR_STYLES=disabled VITE_USE_NITRO=true playwright test --project=chromium", "test:e2e:dev:custom-basepath:nitro": "MODE=dev SSR_STYLES=custom-basepath VITE_USE_NITRO=true playwright test --project=chromium", - "test:e2e:dev:bundled-dev:nitro": "MODE=dev VITE_USE_NITRO=true E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium", - "test:e2e:dev:disabled:bundled-dev:nitro": "MODE=dev SSR_STYLES=disabled VITE_USE_NITRO=true E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium", - "test:e2e:dev:custom-basepath:bundled-dev:nitro": "MODE=dev SSR_STYLES=custom-basepath VITE_USE_NITRO=true E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium", "test:e2e:bundled-dev": "pnpm run test:e2e:dev:bundled-dev && pnpm run test:e2e:dev:disabled:bundled-dev && pnpm run test:e2e:dev:custom-basepath:bundled-dev", - "test:e2e:nitro:bundled-dev": "pnpm run test:e2e:dev:bundled-dev:nitro && pnpm run test:e2e:dev:disabled:bundled-dev:nitro && pnpm run test:e2e:dev:custom-basepath:bundled-dev:nitro", "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:dev:disabled && pnpm run test:e2e:dev:custom-basepath && pnpm run test:e2e:bundled-dev", - "test:e2e:nitro": "pnpm run test:e2e:dev:nitro && pnpm run test:e2e:dev:disabled:nitro && pnpm run test:e2e:dev:custom-basepath:nitro && pnpm run test:e2e:nitro:bundled-dev" + "test:e2e:nitro": "pnpm run test:e2e:dev:nitro && pnpm run test:e2e:dev:disabled:nitro && pnpm run test:e2e:dev:custom-basepath:nitro" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -44,8 +40,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", - "srvx": "^0.11.9", + "nitro": "^3.0.260903-beta", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/react-start/dev-ssr-styles/playwright.config.ts b/e2e/react-start/dev-ssr-styles/playwright.config.ts index e587ac574c..71cc8ed2da 100644 --- a/e2e/react-start/dev-ssr-styles/playwright.config.ts +++ b/e2e/react-start/dev-ssr-styles/playwright.config.ts @@ -13,6 +13,8 @@ const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` // Select the appropriate dev command based on SSR_STYLES + VITE_USE_NITRO +// package.json omits bundled Nitro runs because its asset plugin produces +// invalid Vite client code. Re-enable those tests once the upstream fix lands. function getDevCommand() { const scriptParts = ['dev:e2e'] if (ssrStylesMode !== 'default') { diff --git a/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx b/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx new file mode 100644 index 0000000000..49d2f96c39 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx @@ -0,0 +1,9 @@ +import styles from '../styles/code-split-route.module.css' + +export function CodeSplitStyledBox() { + return ( +
+ This box should have a blue background when dev styles are enabled. +
+ ) +} diff --git a/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts b/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts index dceedffdc1..96c0a37142 100644 --- a/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts +++ b/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts @@ -10,33 +10,63 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' +import { Route as CssImportOrderRouteImport } from './routes/css-import-order' +import { Route as InlineCssRouteImport } from './routes/inline-css' +import { Route as ModuleStateRouteImport } from './routes/module-state' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const CssImportOrderRoute = CssImportOrderRouteImport.update({ + id: '/css-import-order', + path: '/css-import-order', + getParentRoute: () => rootRouteImport, +} as any) +const InlineCssRoute = InlineCssRouteImport.update({ + id: '/inline-css', + path: '/inline-css', + getParentRoute: () => rootRouteImport, +} as any) +const ModuleStateRoute = ModuleStateRouteImport.update({ + id: '/module-state', + path: '/module-state', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute + '/css-import-order': typeof CssImportOrderRoute + '/inline-css': typeof InlineCssRoute + '/module-state': typeof ModuleStateRoute } export interface FileRoutesByTo { '/': typeof IndexRoute + '/css-import-order': typeof CssImportOrderRoute + '/inline-css': typeof InlineCssRoute + '/module-state': typeof ModuleStateRoute } export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute + '/css-import-order': typeof CssImportOrderRoute + '/inline-css': typeof InlineCssRoute + '/module-state': typeof ModuleStateRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' + fullPaths: '/' | '/css-import-order' | '/inline-css' | '/module-state' fileRoutesByTo: FileRoutesByTo - to: '/' - id: '__root__' | '/' + to: '/' | '/css-import-order' | '/inline-css' | '/module-state' + id: '__root__' | '/' | '/css-import-order' | '/inline-css' | '/module-state' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute + CssImportOrderRoute: typeof CssImportOrderRoute + InlineCssRoute: typeof InlineCssRoute + ModuleStateRoute: typeof ModuleStateRoute } declare module '@tanstack/react-router' { @@ -48,11 +78,35 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/css-import-order': { + id: '/css-import-order' + path: '/css-import-order' + fullPath: '/css-import-order' + preLoaderRoute: typeof CssImportOrderRouteImport + parentRoute: typeof rootRouteImport + } + '/inline-css': { + id: '/inline-css' + path: '/inline-css' + fullPath: '/inline-css' + preLoaderRoute: typeof InlineCssRouteImport + parentRoute: typeof rootRouteImport + } + '/module-state': { + id: '/module-state' + path: '/module-state' + fullPath: '/module-state' + preLoaderRoute: typeof ModuleStateRouteImport + parentRoute: typeof rootRouteImport + } } } const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, + CssImportOrderRoute: CssImportOrderRoute, + InlineCssRoute: InlineCssRoute, + ModuleStateRoute: ModuleStateRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/dev-ssr-styles/src/routes/css-import-order.tsx b/e2e/react-start/dev-ssr-styles/src/routes/css-import-order.tsx new file mode 100644 index 0000000000..345254bb8c --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/routes/css-import-order.tsx @@ -0,0 +1,17 @@ +import { createFileRoute } from '@tanstack/react-router' +import '../styles/css-import-order.css' + +export const Route = createFileRoute('/css-import-order')({ + component: CssImportOrder, +}) + +function CssImportOrder() { + return ( +
+

CSS import order

+
+ The route stylesheet should override its imported base stylesheet. +
+
+ ) +} diff --git a/e2e/react-start/dev-ssr-styles/src/routes/index.tsx b/e2e/react-start/dev-ssr-styles/src/routes/index.tsx index f5fadf464d..62fb237750 100644 --- a/e2e/react-start/dev-ssr-styles/src/routes/index.tsx +++ b/e2e/react-start/dev-ssr-styles/src/routes/index.tsx @@ -1,4 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' +import { CodeSplitStyledBox } from '../components/CodeSplitStyledBox' export const Route = createFileRoute('/')({ component: Home, @@ -8,9 +9,7 @@ function Home() { return (

Dev SSR Styles Test

-
- This box should have a blue background when dev styles are enabled. -
+
) } diff --git a/e2e/react-start/dev-ssr-styles/src/routes/inline-css.tsx b/e2e/react-start/dev-ssr-styles/src/routes/inline-css.tsx new file mode 100644 index 0000000000..ffc59128e0 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/routes/inline-css.tsx @@ -0,0 +1,19 @@ +import { createFileRoute } from '@tanstack/react-router' +import embeddedCss from '../styles/embedded.css?inline' + +export const Route = createFileRoute('/inline-css')({ + loader: () => embeddedCss, + component: InlineCss, +}) + +function InlineCss() { + const css = Route.useLoaderData() + return ( +
+
+ Inline styles must not change the page layout. +
+
{css}
+
+ ) +} diff --git a/e2e/react-start/dev-ssr-styles/src/routes/module-state.ts b/e2e/react-start/dev-ssr-styles/src/routes/module-state.ts new file mode 100644 index 0000000000..546217efc3 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/routes/module-state.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' + +const instanceId = crypto.randomUUID() + +export const Route = createFileRoute('/module-state')({ + server: { + handlers: { + GET: () => new Response(instanceId), + }, + }, +}) diff --git a/e2e/react-start/dev-ssr-styles/src/styles/app.css b/e2e/react-start/dev-ssr-styles/src/styles/app.css index 06b48f8a7c..4285da0c86 100644 --- a/e2e/react-start/dev-ssr-styles/src/styles/app.css +++ b/e2e/react-start/dev-ssr-styles/src/styles/app.css @@ -5,9 +5,10 @@ body { background-color: #f0f4f8; } -.styled-box { - background-color: #3b82f6; - color: white; - padding: 24px; - border-radius: 12px; +@layer utilities { + .inline-css-layout { + margin: 12px; + padding: 24px; + border: 3px solid black; + } } diff --git a/e2e/react-start/dev-ssr-styles/src/styles/code-split-route.module.css b/e2e/react-start/dev-ssr-styles/src/styles/code-split-route.module.css new file mode 100644 index 0000000000..d6a50211ee --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/code-split-route.module.css @@ -0,0 +1,7 @@ +.styledBox { + background-color: #3b82f6; + background-image: url('./ssr-background.svg?no-inline'); + color: white; + padding: 24px; + border-radius: 12px; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/css-import-base.css b/e2e/react-start/dev-ssr-styles/src/styles/css-import-base.css new file mode 100644 index 0000000000..4f73ddab9c --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/css-import-base.css @@ -0,0 +1,5 @@ +.css-import-order { + --css-import-base-marker: issue-7794; + background-color: #ffffff; + color: #000000; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/css-import-order.css b/e2e/react-start/dev-ssr-styles/src/styles/css-import-order.css new file mode 100644 index 0000000000..afcb4797d9 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/css-import-order.css @@ -0,0 +1,7 @@ +@import './css-import-base.css'; + +.css-import-order { + background-color: #111827; + color: #ffffff; + padding: 24px; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/embedded-preflight.css b/e2e/react-start/dev-ssr-styles/src/styles/embedded-preflight.css new file mode 100644 index 0000000000..13810d6c98 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/embedded-preflight.css @@ -0,0 +1,6 @@ +* { + --embedded-preflight-marker: 1; + margin: 0; + padding: 0; + border: 0 solid; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/embedded-theme.css b/e2e/react-start/dev-ssr-styles/src/styles/embedded-theme.css new file mode 100644 index 0000000000..171ed5e174 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/embedded-theme.css @@ -0,0 +1,3 @@ +:root { + --embedded-theme-marker: 1; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/embedded-utilities.css b/e2e/react-start/dev-ssr-styles/src/styles/embedded-utilities.css new file mode 100644 index 0000000000..01f81c3b86 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/embedded-utilities.css @@ -0,0 +1,3 @@ +.embedded-utility { + --embedded-utilities-marker: 1; +} diff --git a/e2e/react-start/dev-ssr-styles/src/styles/embedded.css b/e2e/react-start/dev-ssr-styles/src/styles/embedded.css new file mode 100644 index 0000000000..7b6b68c48d --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/embedded.css @@ -0,0 +1,3 @@ +@import './embedded-theme.css' layer(theme); +@import './embedded-preflight.css' layer(base); +@import './embedded-utilities.css' layer(utilities); diff --git a/e2e/react-start/dev-ssr-styles/src/styles/ssr-background.svg b/e2e/react-start/dev-ssr-styles/src/styles/ssr-background.svg new file mode 100644 index 0000000000..7916b3ef16 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/src/styles/ssr-background.svg @@ -0,0 +1 @@ + diff --git a/e2e/react-start/dev-ssr-styles/tests/app.spec.ts b/e2e/react-start/dev-ssr-styles/tests/app.spec.ts index cb1ba0b29b..f5b72a1bca 100644 --- a/e2e/react-start/dev-ssr-styles/tests/app.spec.ts +++ b/e2e/react-start/dev-ssr-styles/tests/app.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' import { DEV_STYLES_ATTR } from '@tanstack/router-core' -import { test } from '@tanstack/router-e2e-utils' +import { createHmrFileEditor, test } from '@tanstack/router-e2e-utils' import { ssrStylesMode } from '../env' // Whitelist errors that can occur in CI: @@ -14,14 +14,60 @@ const whitelistErrors = [ test.describe(`dev.ssrStyles (mode=${ssrStylesMode})`, () => { test.use({ whitelistErrors }) + test('unchanged SSR requests reuse evaluated modules', async ({ + request, + }) => { + const first = await request.get('/module-state') + const second = await request.get('/module-state') + expect(first.ok()).toBeTruthy() + expect(second.ok()).toBeTruthy() + expect(await second.text()).toBe(await first.text()) + }) + test('page renders correctly', async ({ page }) => { + const runtimeErrors: Array = [] + page.on('pageerror', (error) => { + runtimeErrors.push(error.message) + }) await page.goto('/') await expect(page.getByTestId('home-heading')).toHaveText( 'Dev SSR Styles Test', ) + expect(runtimeErrors).toEqual([]) }) if (ssrStylesMode === 'default') { + test('dev CSS order is stable after client modules load', async ({ + page, + }) => { + const cssBodies: Array> = [] + page.on('response', (response) => { + if ( + new URL(response.url()).pathname.endsWith( + '/@tanstack-start/styles.css', + ) + ) { + cssBodies.push(response.text()) + } + }) + + await page.goto('/css-import-order') + await expect(page.getByTestId('css-import-order')).toBeVisible() + await expect.poll(() => cssBodies.length).toBeGreaterThanOrEqual(1) + + await page.reload() + await expect(page.getByTestId('css-import-order')).toBeVisible() + await expect.poll(() => cssBodies.length).toBeGreaterThanOrEqual(2) + + const [initialCss, reloadedCss] = await Promise.all(cssBodies.slice(0, 2)) + expect(reloadedCss).toBe(initialCss) + expect(initialCss).toContain('/* /src/styles/app.css */') + expect(initialCss).toContain('/* /src/styles/css-import-order.css */') + expect(initialCss.indexOf('/* /src/styles/app.css */')).toBeLessThan( + initialCss.indexOf('/* /src/styles/css-import-order.css */'), + ) + }) + test.describe('default (enabled, basepath = vite base)', () => { test.use({ javaScriptEnabled: false, whitelistErrors }) @@ -52,7 +98,9 @@ test.describe(`dev.ssrStyles (mode=${ssrStylesMode})`, () => { expect(href).toMatch(/^\/@tanstack-start\/styles\.css/) }) - test('CSS is applied on initial page load (SSR)', async ({ page }) => { + test('CSS from a code-split route component is applied during SSR', async ({ + page, + }) => { await page.goto('/') const element = page.getByTestId('styled-box') @@ -64,6 +112,81 @@ test.describe(`dev.ssrStyles (mode=${ssrStylesMode})`, () => { ) expect(backgroundColor).toBe('rgb(59, 130, 246)') }) + + test('SSR CSS updates after a stylesheet edit', async ({ page }) => { + const editor = createHmrFileEditor({ + rootDir: import.meta.dirname, + files: { css: '../src/styles/code-split-route.module.css' }, + }) + await editor.capturePromise + const expectSsrColor = async (color: string) => { + await expect(async () => { + await page.reload() + await expect(page.getByTestId('styled-box')).toHaveCSS( + 'background-color', + color, + ) + }).toPass({ timeout: 20_000 }) + } + try { + await page.goto('/') + await expect(page.getByTestId('styled-box')).toHaveCSS( + 'background-color', + 'rgb(59, 130, 246)', + ) + await editor.replaceText('css', '#3b82f6', '#ef4444') + await expectSsrColor('rgb(239, 68, 68)') + } finally { + await editor.restoreFiles() + // Finish the restore before another test reads the SSR stylesheet. + await expectSsrColor('rgb(59, 130, 246)') + } + }) + + test('assets referenced by SSR CSS are available before hydration', async ({ + page, + }) => { + await page.goto('/') + const backgroundImage = await page + .getByTestId('styled-box') + .evaluate((element) => getComputedStyle(element).backgroundImage) + const assetUrl = backgroundImage.match(/^url\("(.+)"\)$/)?.[1] + expect(assetUrl).toBeDefined() + const response = await page.request.get(assetUrl!) + expect(response.ok()).toBeTruthy() + expect(response.headers()['content-type']).toContain('image/svg+xml') + expect(await response.text()).toContain(' { + await page.goto('/css-import-order') + + const element = page.getByTestId('css-import-order') + await expect(element).toBeVisible() + + // css-import-order.css imports a white base rule, then overrides it + // with this dark background. Collecting the imported file separately + // appends the white rule and reverses the intended cascade. + const backgroundColor = await element.evaluate( + (el) => getComputedStyle(el).backgroundColor, + ) + expect(backgroundColor).toBe('rgb(17, 24, 39)') + + const devStylesHref = await page + .locator(`link[${DEV_STYLES_ATTR}]`) + .getAttribute('href') + expect(devStylesHref).toBeTruthy() + + const cssResponse = await page.request.get( + new URL(devStylesHref!, page.url()).href, + ) + expect(cssResponse.ok()).toBeTruthy() + + const css = await cssResponse.text() + expect(css.match(/--css-import-base-marker/g)).toHaveLength(1) + }) }) } diff --git a/e2e/react-start/dev-ssr-styles/tests/inline-css.spec.ts b/e2e/react-start/dev-ssr-styles/tests/inline-css.spec.ts new file mode 100644 index 0000000000..c564a9977a --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/tests/inline-css.spec.ts @@ -0,0 +1,35 @@ +import { expect } from '@playwright/test' +import { DEV_STYLES_ATTR } from '@tanstack/router-core' +import { test } from '@tanstack/router-e2e-utils' +import { ssrStylesMode } from '../env' + +test.describe('server inline CSS with layered imports', () => { + test.skip(ssrStylesMode !== 'default', 'Requires the default dev stylesheet') + test.use({ javaScriptEnabled: false }) + + test('keeps layered inline imports out of the global dev stylesheet', async ({ + page, + }) => { + await page.goto('/inline-css') + const embeddedCss = await page.getByTestId('embedded-css').textContent() + for (const layer of ['theme', 'base', 'utilities']) { + expect(embeddedCss).toContain(`@layer ${layer}`) + } + for (const marker of ['theme', 'preflight', 'utilities']) { + expect(embeddedCss).toContain(`--embedded-${marker}-marker`) + } + + const href = await page + .locator(`link[${DEV_STYLES_ATTR}]`) + .getAttribute('href') + expect(href).toBeTruthy() + const response = await page.request.get(new URL(href!, page.url()).href) + expect(response.ok()).toBeTruthy() + expect(await response.text()).not.toContain('--embedded-') + + const layout = page.getByTestId('inline-css-layout') + await expect(layout).toHaveCSS('padding-top', '24px') + await expect(layout).toHaveCSS('margin-top', '12px') + await expect(layout).toHaveCSS('border-top-width', '3px') + }) +}) diff --git a/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts b/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts index 4e560eea47..43fad46254 100644 --- a/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts +++ b/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts @@ -1,14 +1,45 @@ +import { chromium, expect } from '@playwright/test' import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { ssrStylesMode } from '../../env' export default async function setup() { - if (process.env.MODE !== 'dev') return + if (process.env.MODE !== 'dev') { + return + } const port = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'home-heading', - }) + + // Check cold SSR before the browser warmup can populate the client graph. + const browser = await chromium.launch() + try { + const page = await browser.newPage({ javaScriptEnabled: false }) + const backgroundAsset = + ssrStylesMode !== 'disabled' + ? page.waitForResponse( + (response) => + new URL(response.url()).pathname.includes('ssr-background'), + { timeout: 60_000 }, + ) + : undefined + await page.goto(baseURL, { timeout: 60_000 }) + await expect(page.getByTestId('home-heading')).toHaveText( + 'Dev SSR Styles Test', + { timeout: 30_000 }, + ) + if (ssrStylesMode !== 'disabled') { + expect((await backgroundAsset!).ok()).toBeTruthy() + await expect(page.getByTestId('styled-box')).toHaveCSS( + 'background-color', + 'rgb(59, 130, 246)', + { timeout: 30_000 }, + ) + } + } finally { + await browser.close() + } + + await preOptimizeDevServer({ baseURL, readyTestId: 'home-heading' }) } diff --git a/e2e/react-start/dev-ssr-styles/vite.config.ts b/e2e/react-start/dev-ssr-styles/vite.config.ts index 555137b543..df5ea34504 100644 --- a/e2e/react-start/dev-ssr-styles/vite.config.ts +++ b/e2e/react-start/dev-ssr-styles/vite.config.ts @@ -20,7 +20,7 @@ export default defineConfig(async () => { return { resolve: { tsconfigPaths: true }, - experimental: viteBundledDev ? { bundledDev: true } : undefined, + experimental: { bundledDev: viteBundledDev }, server: { port: 3000, }, diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json index f8a72a7aa7..1615b99430 100644 --- a/e2e/react-start/early-hints/package.json +++ b/e2e/react-start/early-hints/package.json @@ -27,7 +27,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "node-forge": "^1.3.1", - "srvx": "0.11.15", + "srvx": "^1.0.0", "tsx": "4.20.3", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts index 661b988281..6d2d31d836 100644 --- a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts +++ b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts @@ -103,7 +103,9 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { const response = await makeRequest(baseURL, '/') const link = earlyHintsLinkHeader(response) - expect(link).toMatch(/<[^>]+>;\s*rel=modulepreload;\s*as=script/) + expect(link).toMatch( + /<[^>]+>;\s*rel=modulepreload;\s*as=script;\s*fetchpriority=low/, + ) }) test('CSS module assets are included in early hints', async () => { @@ -145,7 +147,7 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { const response = await makeRequest(baseURL, '/') const link = linkHeader(response.finalHeaders) - expect(link).toContain('rel=modulepreload; as=script') + expect(link).toContain('rel=modulepreload; as=script; fetchpriority=low') expect(link).toContain('; rel=preconnect') }) diff --git a/e2e/react-start/flamegraph-bench/package.json b/e2e/react-start/flamegraph-bench/package.json index eb72de699a..72410b13e1 100644 --- a/e2e/react-start/flamegraph-bench/package.json +++ b/e2e/react-start/flamegraph-bench/package.json @@ -14,12 +14,12 @@ "@tanstack/react-start": "workspace:*", "react": "^19.0.0", "react-dom": "^19.0.0", - "srvx": "^0.11.9" + "srvx": "^1.0.0" }, "devDependencies": { "@platformatic/flame": "latest", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "autocannon": "^8.0.0", "concurrently": "9.2.1", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/hmr/package.json b/e2e/react-start/hmr/package.json index 7a6dc23f76..76a5d86b1f 100644 --- a/e2e/react-start/hmr/package.json +++ b/e2e/react-start/hmr/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-start/hmr/tests/app.spec.ts b/e2e/react-start/hmr/tests/app.spec.ts index fe6dd99389..645c9b06f3 100644 --- a/e2e/react-start/hmr/tests/app.spec.ts +++ b/e2e/react-start/hmr/tests/app.spec.ts @@ -607,8 +607,18 @@ test.describe('react-start hmr', () => { test('preserves local state for code-split route component HMR', async ({ page, }) => { + // Hydration can finish before Vite connects its HMR socket. + const hmrReady = + (process.env.E2E_TOOLCHAIN ?? 'vite') === 'vite' + ? page.waitForEvent('websocket').then((socket) => { + return socket.waitForEvent('framereceived', ({ payload }) => { + return JSON.parse(String(payload)).type === 'connected' + }) + }) + : Promise.resolve() await page.goto('/') await page.getByTestId('hydrated').waitFor({ state: 'visible' }) + await hmrReady await page.getByTestId('increment').click() await page.getByTestId('message').fill('hmr state') @@ -922,6 +932,7 @@ test.describe('react-start hmr', () => { await waitForRouteModuleUpdate(page, '/child', 'Child Updated') }, ) + await waitForHydrationSafeReload(page, '/child', 'Child Updated') // Second edit: change child loader again while still on / await replaceRouteTextAndWait( diff --git a/e2e/react-start/import-protection-custom-config/package.json b/e2e/react-start/import-protection-custom-config/package.json index 59ac648651..c088eff106 100644 --- a/e2e/react-start/import-protection-custom-config/package.json +++ b/e2e/react-start/import-protection-custom-config/package.json @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/import-protection/package.json b/e2e/react-start/import-protection/package.json index 5459b84437..ad06ba41ea 100644 --- a/e2e/react-start/import-protection/package.json +++ b/e2e/react-start/import-protection/package.json @@ -22,14 +22,14 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/import-protection/src/routes/index.tsx b/e2e/react-start/import-protection/src/routes/index.tsx index c05ed1a7e3..ef8544dc3c 100644 --- a/e2e/react-start/import-protection/src/routes/index.tsx +++ b/e2e/react-start/import-protection/src/routes/index.tsx @@ -1,4 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute, useHydrated } from '@tanstack/react-router' // This import chain triggers a file-based violation in the CLIENT env: // index.tsx -> violations/edge-a.ts -> violations/secret.server.ts import { getWrappedSecret } from '../violations/edge-a' @@ -25,10 +25,12 @@ export const Route = createFileRoute('/')({ }) function Home() { + const hydrated = useHydrated() return (

Import Protection E2E

App loaded successfully with mock mode

+

{hydrated ? 'hydrated' : 'ssr'}

{getWrappedSecret()}

{getWrappedSecret1()}

{getServerOnlyDataViaEdge()}

diff --git a/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts b/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts index ab44237539..d74bc6430b 100644 --- a/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts +++ b/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts @@ -6,7 +6,7 @@ import { getRequest } from '@tanstack/react-start/server' // so the compiler should prune this import from the client bundle. // // This mirrors the real-world pattern of a session utility that wraps -// `useSession` from `@tanstack/react-start/server`. +// `getCookie` from `@tanstack/react-start/server`. export function getSessionData() { const req = getRequest() return { method: req.method } diff --git a/e2e/react-start/import-protection/tests/violations.setup.ts b/e2e/react-start/import-protection/tests/violations.setup.ts index 4077d7dd19..d0f4f70d03 100644 --- a/e2e/react-start/import-protection/tests/violations.setup.ts +++ b/e2e/react-start/import-protection/tests/violations.setup.ts @@ -172,6 +172,20 @@ async function navigateAllRoutes( const context = await browser.newContext() const page = await context.newPage() + // Safe factory imports must actually compile and hydrate. A crashed lazy + // compiler must not pass simply because it emitted no violation diagnostics. + await page.goto(baseURL) + await expect(page.getByTestId('hydration-status')).toHaveText('hydrated', { + timeout: 30_000, + }) + for (const testId of [ + 'factory-safe', + 'cross-boundary-safe-sf', + 'cross-boundary-safe-mw', + ]) { + await expect(page.getByTestId(testId)).toHaveText('function') + } + for (const [route, testId, expectedViolation] of routeDefinitions) { try { // Prefer 'networkidle' (ensures route chunks are actually fetched), but diff --git a/e2e/react-start/response-reconciliation/.gitignore b/e2e/react-start/response-reconciliation/.gitignore new file mode 100644 index 0000000000..16187ac1de --- /dev/null +++ b/e2e/react-start/response-reconciliation/.gitignore @@ -0,0 +1,24 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.tanstack +.env +.vercel +.output +/build/ +/api/ +/server/build +/public/build + +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ +/dist/ +/dist-*/ +/port-*.txt diff --git a/e2e/react-start/response-reconciliation/.prettierignore b/e2e/react-start/response-reconciliation/.prettierignore new file mode 100644 index 0000000000..40a96e8819 --- /dev/null +++ b/e2e/react-start/response-reconciliation/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts diff --git a/e2e/react-start/response-reconciliation/package.json b/e2e/react-start/response-reconciliation/package.json new file mode 100644 index 0000000000..7ba0224962 --- /dev/null +++ b/e2e/react-start/response-reconciliation/package.json @@ -0,0 +1,84 @@ +{ + "name": "tanstack-react-start-e2e-response-reconciliation", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "pnpm dev:vite --port 3000", + "dev:e2e": "pnpm dev:vite", + "dev:vite": "vite dev", + "dev:rsbuild": "rsbuild dev", + "build": "pnpm build:vite", + "build:vite": "vite build && tsc --noEmit", + "build:rsbuild": "rsbuild build && tsc --noEmit", + "preview": "vite preview", + "start": "node server.js", + "test:e2e:local": "pnpm build && playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/react-router": "workspace:*", + "@tanstack/react-start": "workspace:*", + "react": "^19.2.3", + "react-dom": "^19.2.3" + }, + "devDependencies": { + "@playwright/test": "^1.57.0", + "@rsbuild/core": "^2.3.1", + "@rsbuild/plugin-react": "^2.0.0", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "25.0.9", + "@types/react": "^19.2.8", + "@types/react-dom": "^19.2.3", + "@vitejs/plugin-react": "^6.0.1", + "srvx": "^1.0.0", + "typescript": "^6.0.2", + "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "parallelism": false + }, + "test:e2e--vite-ssr": { + "parallelism": false + }, + "test:e2e--vite-ssr--custom-entry": { + "parallelism": false + }, + "test:e2e--rsbuild-ssr": { + "parallelism": false + }, + "test:e2e--rsbuild-ssr--custom-entry": { + "parallelism": false + } + }, + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "vite", + "mode": "ssr", + "name": "custom-entry", + "env": { + "TSS_E2E_SERVER_ENTRY": "server-entry" + } + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr", + "name": "custom-entry", + "env": { + "TSS_E2E_SERVER_ENTRY": "server-entry" + } + } + ] + } + } +} diff --git a/e2e/react-start/response-reconciliation/playwright.config.ts b/e2e/react-start/response-reconciliation/playwright.config.ts new file mode 100644 index 0000000000..d4c9c58f43 --- /dev/null +++ b/e2e/react-start/response-reconciliation/playwright.config.ts @@ -0,0 +1,37 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const distDir = process.env.E2E_DIST_DIR ?? 'dist' +const serverEntry = process.env.TSS_E2E_SERVER_ENTRY ?? '' + +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { + baseURL, + }, + webServer: { + command: `pnpm start`, + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + env: { + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_TOOLCHAIN: toolchain, + TSS_E2E_SERVER_ENTRY: serverEntry, + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/response-reconciliation/rsbuild.config.ts b/e2e/react-start/response-reconciliation/rsbuild.config.ts new file mode 100644 index 0000000000..38f44ef9fb --- /dev/null +++ b/e2e/react-start/response-reconciliation/rsbuild.config.ts @@ -0,0 +1,20 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' + +const serverEntry = process.env.TSS_E2E_SERVER_ENTRY +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + plugins: [ + pluginReact(), + tanstackStart({ + server: serverEntry ? { entry: serverEntry } : undefined, + }), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/server.js b/e2e/react-start/response-reconciliation/server.js new file mode 100644 index 0000000000..324a462bec --- /dev/null +++ b/e2e/react-start/response-reconciliation/server.js @@ -0,0 +1,62 @@ +import fs from 'node:fs' +import path from 'node:path' +import { spawn } from 'node:child_process' +import { pathToFileURL } from 'node:url' + +const distDir = process.env.E2E_DIST_DIR || 'dist' + +function resolveDistClientDir() { + return path.resolve(distDir, 'client') +} + +function resolveDistServerEntryPath() { + if (process.env.TSS_E2E_SERVER_ENTRY) { + const customEntryPath = path.resolve( + distDir, + 'server', + `${process.env.TSS_E2E_SERVER_ENTRY}.js`, + ) + if (fs.existsSync(customEntryPath)) { + return customEntryPath + } + } + + const serverJsPath = path.resolve(distDir, 'server', 'server.js') + if (fs.existsSync(serverJsPath)) { + return serverJsPath + } + + const indexJsPath = path.resolve(distDir, 'server', 'index.js') + if (fs.existsSync(indexJsPath)) { + return indexJsPath + } + + return serverJsPath +} + +export function start() { + const child = spawn( + 'srvx', + ['--prod', '-s', resolveDistClientDir(), resolveDistServerEntryPath()], + { + stdio: 'inherit', + shell: process.platform === 'win32', + }, + ) + + child.on('exit', (code, signal) => { + if (signal) { + process.kill(process.pid, signal) + return + } + + process.exit(code ?? 0) + }) +} + +if ( + process.argv[1] && + import.meta.url === pathToFileURL(process.argv[1]).href +) { + start() +} diff --git a/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..f3d691814f --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,20 @@ +import { ErrorComponent, Link, useRouter } from '@tanstack/react-router' +import type { ErrorComponentProps } from '@tanstack/react-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + + return ( +
+ + + Home +
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/components/NotFound.tsx b/e2e/react-start/response-reconciliation/src/components/NotFound.tsx new file mode 100644 index 0000000000..0b720f0e37 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/components/NotFound.tsx @@ -0,0 +1,10 @@ +import { Link } from '@tanstack/react-router' + +export function NotFound({ children }: { children?: React.ReactNode }) { + return ( +
+ {children ||

The page you are looking for does not exist.

} + Start Over +
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/response-wrapper.ts b/e2e/react-start/response-reconciliation/src/response-wrapper.ts new file mode 100644 index 0000000000..db9733d5e6 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/response-wrapper.ts @@ -0,0 +1,33 @@ +import { getRequestHeader } from '@tanstack/react-start/server' + +let installed = false + +/** + * Stand-in for libraries that wrap the global Response and pipe stream bodies, + * such as varlock's leak prevention: afterwards `new Response(stream).body` is + * a new stream that reads `stream`. Only requests that send + * `x-wrap-response: true` are affected. + */ +export function installResponseWrapper() { + if (installed) { + return + } + installed = true + globalThis.Response = new Proxy(globalThis.Response, { + construct(target, [body, init], newTarget) { + if (body instanceof ReadableStream && wrapsResponses()) { + body = body.pipeThrough(new TransformStream()) + } + return Reflect.construct(target, [body, init], newTarget) + }, + }) +} + +function wrapsResponses() { + try { + return getRequestHeader('x-wrap-response') === 'true' + } catch { + // Responses created outside a request are never wrapped. + return false + } +} diff --git a/e2e/react-start/response-reconciliation/src/routeTree.gen.ts b/e2e/react-start/response-reconciliation/src/routeTree.gen.ts new file mode 100644 index 0000000000..3dbb6301c3 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routeTree.gen.ts @@ -0,0 +1,625 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ServerFunctionsRouteImport } from './routes/server-functions' +import { Route as SsrRouteImport } from './routes/ssr' +import { Route as StreamedRouteImport } from './routes/streamed' +import { Route as ApiBaseRouteImport } from './routes/api/base' +import { Route as ApiBulkHeadersRouteImport } from './routes/api/bulk-headers' +import { Route as ApiClearReturnedHeadersRouteImport } from './routes/api/clear-returned-headers' +import { Route as ApiDirectMutationVisibleRouteImport } from './routes/api/direct-mutation-visible' +import { Route as ApiExplicitSetCookieHeaderRouteImport } from './routes/api/explicit-set-cookie-header' +import { Route as ApiFramingErrorRouteImport } from './routes/api/framing-error' +import { Route as ApiGetResponseHeaderHelperRouteImport } from './routes/api/get-response-header-helper' +import { Route as ApiGetResponseHeadersHelperRouteImport } from './routes/api/get-response-headers-helper' +import { Route as ApiMultipleCookiesRouteImport } from './routes/api/multiple-cookies' +import { Route as ApiNullBodyStatusRouteImport } from './routes/api/null-body-status' +import { Route as ApiReadonlyAfterNextRouteImport } from './routes/api/readonly-after-next' +import { Route as ApiRedirectWithCookiesRouteImport } from './routes/api/redirect-with-cookies' +import { Route as ApiRemoveReturnedHeaderRouteImport } from './routes/api/remove-returned-header' +import { Route as ApiReplaceAfterDirectMutationRouteImport } from './routes/api/replace-after-direct-mutation' +import { Route as ApiReplaceExplicitSetCookieRouteImport } from './routes/api/replace-explicit-set-cookie' +import { Route as ApiRouteAfterNextRouteImport } from './routes/api/route-after-next' +import { Route as ApiRouteBeforeNextRouteImport } from './routes/api/route-before-next' +import { Route as ApiSameBoundaryConflictRouteImport } from './routes/api/same-boundary-conflict' +import { Route as ApiStatusContractsRouteImport } from './routes/api/status-contracts' +import { Route as ApiThrowAfterStatusRouteImport } from './routes/api/throw-after-status' +import { Route as ApiTrackedStreamRouteImport } from './routes/api/tracked-stream' +import { Route as ApiTrackedStreamStatusRouteImport } from './routes/api/tracked-stream-status' +import { Route as ApiTwoReturnedResponsesRouteImport } from './routes/api/two-returned-responses' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const ServerFunctionsRoute = ServerFunctionsRouteImport.update({ + id: '/server-functions', + path: '/server-functions', + getParentRoute: () => rootRouteImport, +} as any) +const SsrRoute = SsrRouteImport.update({ + id: '/ssr', + path: '/ssr', + getParentRoute: () => rootRouteImport, +} as any) +const StreamedRoute = StreamedRouteImport.update({ + id: '/streamed', + path: '/streamed', + getParentRoute: () => rootRouteImport, +} as any) +const ApiBaseRoute = ApiBaseRouteImport.update({ + id: '/api/base', + path: '/api/base', + getParentRoute: () => rootRouteImport, +} as any) +const ApiBulkHeadersRoute = ApiBulkHeadersRouteImport.update({ + id: '/api/bulk-headers', + path: '/api/bulk-headers', + getParentRoute: () => rootRouteImport, +} as any) +const ApiClearReturnedHeadersRoute = ApiClearReturnedHeadersRouteImport.update({ + id: '/api/clear-returned-headers', + path: '/api/clear-returned-headers', + getParentRoute: () => rootRouteImport, +} as any) +const ApiDirectMutationVisibleRoute = + ApiDirectMutationVisibleRouteImport.update({ + id: '/api/direct-mutation-visible', + path: '/api/direct-mutation-visible', + getParentRoute: () => rootRouteImport, + } as any) +const ApiExplicitSetCookieHeaderRoute = + ApiExplicitSetCookieHeaderRouteImport.update({ + id: '/api/explicit-set-cookie-header', + path: '/api/explicit-set-cookie-header', + getParentRoute: () => rootRouteImport, + } as any) +const ApiFramingErrorRoute = ApiFramingErrorRouteImport.update({ + id: '/api/framing-error', + path: '/api/framing-error', + getParentRoute: () => rootRouteImport, +} as any) +const ApiGetResponseHeaderHelperRoute = + ApiGetResponseHeaderHelperRouteImport.update({ + id: '/api/get-response-header-helper', + path: '/api/get-response-header-helper', + getParentRoute: () => rootRouteImport, + } as any) +const ApiGetResponseHeadersHelperRoute = + ApiGetResponseHeadersHelperRouteImport.update({ + id: '/api/get-response-headers-helper', + path: '/api/get-response-headers-helper', + getParentRoute: () => rootRouteImport, + } as any) +const ApiMultipleCookiesRoute = ApiMultipleCookiesRouteImport.update({ + id: '/api/multiple-cookies', + path: '/api/multiple-cookies', + getParentRoute: () => rootRouteImport, +} as any) +const ApiNullBodyStatusRoute = ApiNullBodyStatusRouteImport.update({ + id: '/api/null-body-status', + path: '/api/null-body-status', + getParentRoute: () => rootRouteImport, +} as any) +const ApiReadonlyAfterNextRoute = ApiReadonlyAfterNextRouteImport.update({ + id: '/api/readonly-after-next', + path: '/api/readonly-after-next', + getParentRoute: () => rootRouteImport, +} as any) +const ApiRedirectWithCookiesRoute = ApiRedirectWithCookiesRouteImport.update({ + id: '/api/redirect-with-cookies', + path: '/api/redirect-with-cookies', + getParentRoute: () => rootRouteImport, +} as any) +const ApiRemoveReturnedHeaderRoute = ApiRemoveReturnedHeaderRouteImport.update({ + id: '/api/remove-returned-header', + path: '/api/remove-returned-header', + getParentRoute: () => rootRouteImport, +} as any) +const ApiReplaceAfterDirectMutationRoute = + ApiReplaceAfterDirectMutationRouteImport.update({ + id: '/api/replace-after-direct-mutation', + path: '/api/replace-after-direct-mutation', + getParentRoute: () => rootRouteImport, + } as any) +const ApiReplaceExplicitSetCookieRoute = + ApiReplaceExplicitSetCookieRouteImport.update({ + id: '/api/replace-explicit-set-cookie', + path: '/api/replace-explicit-set-cookie', + getParentRoute: () => rootRouteImport, + } as any) +const ApiRouteAfterNextRoute = ApiRouteAfterNextRouteImport.update({ + id: '/api/route-after-next', + path: '/api/route-after-next', + getParentRoute: () => rootRouteImport, +} as any) +const ApiRouteBeforeNextRoute = ApiRouteBeforeNextRouteImport.update({ + id: '/api/route-before-next', + path: '/api/route-before-next', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSameBoundaryConflictRoute = ApiSameBoundaryConflictRouteImport.update({ + id: '/api/same-boundary-conflict', + path: '/api/same-boundary-conflict', + getParentRoute: () => rootRouteImport, +} as any) +const ApiStatusContractsRoute = ApiStatusContractsRouteImport.update({ + id: '/api/status-contracts', + path: '/api/status-contracts', + getParentRoute: () => rootRouteImport, +} as any) +const ApiThrowAfterStatusRoute = ApiThrowAfterStatusRouteImport.update({ + id: '/api/throw-after-status', + path: '/api/throw-after-status', + getParentRoute: () => rootRouteImport, +} as any) +const ApiTrackedStreamRoute = ApiTrackedStreamRouteImport.update({ + id: '/api/tracked-stream', + path: '/api/tracked-stream', + getParentRoute: () => rootRouteImport, +} as any) +const ApiTrackedStreamStatusRoute = ApiTrackedStreamStatusRouteImport.update({ + id: '/api/tracked-stream-status', + path: '/api/tracked-stream-status', + getParentRoute: () => rootRouteImport, +} as any) +const ApiTwoReturnedResponsesRoute = ApiTwoReturnedResponsesRouteImport.update({ + id: '/api/two-returned-responses', + path: '/api/two-returned-responses', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/streamed': typeof StreamedRoute + '/api/base': typeof ApiBaseRoute + '/api/bulk-headers': typeof ApiBulkHeadersRoute + '/api/clear-returned-headers': typeof ApiClearReturnedHeadersRoute + '/api/direct-mutation-visible': typeof ApiDirectMutationVisibleRoute + '/api/explicit-set-cookie-header': typeof ApiExplicitSetCookieHeaderRoute + '/api/framing-error': typeof ApiFramingErrorRoute + '/api/get-response-header-helper': typeof ApiGetResponseHeaderHelperRoute + '/api/get-response-headers-helper': typeof ApiGetResponseHeadersHelperRoute + '/api/multiple-cookies': typeof ApiMultipleCookiesRoute + '/api/null-body-status': typeof ApiNullBodyStatusRoute + '/api/readonly-after-next': typeof ApiReadonlyAfterNextRoute + '/api/redirect-with-cookies': typeof ApiRedirectWithCookiesRoute + '/api/remove-returned-header': typeof ApiRemoveReturnedHeaderRoute + '/api/replace-after-direct-mutation': typeof ApiReplaceAfterDirectMutationRoute + '/api/replace-explicit-set-cookie': typeof ApiReplaceExplicitSetCookieRoute + '/api/route-after-next': typeof ApiRouteAfterNextRoute + '/api/route-before-next': typeof ApiRouteBeforeNextRoute + '/api/same-boundary-conflict': typeof ApiSameBoundaryConflictRoute + '/api/status-contracts': typeof ApiStatusContractsRoute + '/api/throw-after-status': typeof ApiThrowAfterStatusRoute + '/api/tracked-stream': typeof ApiTrackedStreamRoute + '/api/tracked-stream-status': typeof ApiTrackedStreamStatusRoute + '/api/two-returned-responses': typeof ApiTwoReturnedResponsesRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/streamed': typeof StreamedRoute + '/api/base': typeof ApiBaseRoute + '/api/bulk-headers': typeof ApiBulkHeadersRoute + '/api/clear-returned-headers': typeof ApiClearReturnedHeadersRoute + '/api/direct-mutation-visible': typeof ApiDirectMutationVisibleRoute + '/api/explicit-set-cookie-header': typeof ApiExplicitSetCookieHeaderRoute + '/api/framing-error': typeof ApiFramingErrorRoute + '/api/get-response-header-helper': typeof ApiGetResponseHeaderHelperRoute + '/api/get-response-headers-helper': typeof ApiGetResponseHeadersHelperRoute + '/api/multiple-cookies': typeof ApiMultipleCookiesRoute + '/api/null-body-status': typeof ApiNullBodyStatusRoute + '/api/readonly-after-next': typeof ApiReadonlyAfterNextRoute + '/api/redirect-with-cookies': typeof ApiRedirectWithCookiesRoute + '/api/remove-returned-header': typeof ApiRemoveReturnedHeaderRoute + '/api/replace-after-direct-mutation': typeof ApiReplaceAfterDirectMutationRoute + '/api/replace-explicit-set-cookie': typeof ApiReplaceExplicitSetCookieRoute + '/api/route-after-next': typeof ApiRouteAfterNextRoute + '/api/route-before-next': typeof ApiRouteBeforeNextRoute + '/api/same-boundary-conflict': typeof ApiSameBoundaryConflictRoute + '/api/status-contracts': typeof ApiStatusContractsRoute + '/api/throw-after-status': typeof ApiThrowAfterStatusRoute + '/api/tracked-stream': typeof ApiTrackedStreamRoute + '/api/tracked-stream-status': typeof ApiTrackedStreamStatusRoute + '/api/two-returned-responses': typeof ApiTwoReturnedResponsesRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/streamed': typeof StreamedRoute + '/api/base': typeof ApiBaseRoute + '/api/bulk-headers': typeof ApiBulkHeadersRoute + '/api/clear-returned-headers': typeof ApiClearReturnedHeadersRoute + '/api/direct-mutation-visible': typeof ApiDirectMutationVisibleRoute + '/api/explicit-set-cookie-header': typeof ApiExplicitSetCookieHeaderRoute + '/api/framing-error': typeof ApiFramingErrorRoute + '/api/get-response-header-helper': typeof ApiGetResponseHeaderHelperRoute + '/api/get-response-headers-helper': typeof ApiGetResponseHeadersHelperRoute + '/api/multiple-cookies': typeof ApiMultipleCookiesRoute + '/api/null-body-status': typeof ApiNullBodyStatusRoute + '/api/readonly-after-next': typeof ApiReadonlyAfterNextRoute + '/api/redirect-with-cookies': typeof ApiRedirectWithCookiesRoute + '/api/remove-returned-header': typeof ApiRemoveReturnedHeaderRoute + '/api/replace-after-direct-mutation': typeof ApiReplaceAfterDirectMutationRoute + '/api/replace-explicit-set-cookie': typeof ApiReplaceExplicitSetCookieRoute + '/api/route-after-next': typeof ApiRouteAfterNextRoute + '/api/route-before-next': typeof ApiRouteBeforeNextRoute + '/api/same-boundary-conflict': typeof ApiSameBoundaryConflictRoute + '/api/status-contracts': typeof ApiStatusContractsRoute + '/api/throw-after-status': typeof ApiThrowAfterStatusRoute + '/api/tracked-stream': typeof ApiTrackedStreamRoute + '/api/tracked-stream-status': typeof ApiTrackedStreamStatusRoute + '/api/two-returned-responses': typeof ApiTwoReturnedResponsesRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/server-functions' + | '/ssr' + | '/streamed' + | '/api/base' + | '/api/bulk-headers' + | '/api/clear-returned-headers' + | '/api/direct-mutation-visible' + | '/api/explicit-set-cookie-header' + | '/api/framing-error' + | '/api/get-response-header-helper' + | '/api/get-response-headers-helper' + | '/api/multiple-cookies' + | '/api/null-body-status' + | '/api/readonly-after-next' + | '/api/redirect-with-cookies' + | '/api/remove-returned-header' + | '/api/replace-after-direct-mutation' + | '/api/replace-explicit-set-cookie' + | '/api/route-after-next' + | '/api/route-before-next' + | '/api/same-boundary-conflict' + | '/api/status-contracts' + | '/api/throw-after-status' + | '/api/tracked-stream' + | '/api/tracked-stream-status' + | '/api/two-returned-responses' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/server-functions' + | '/ssr' + | '/streamed' + | '/api/base' + | '/api/bulk-headers' + | '/api/clear-returned-headers' + | '/api/direct-mutation-visible' + | '/api/explicit-set-cookie-header' + | '/api/framing-error' + | '/api/get-response-header-helper' + | '/api/get-response-headers-helper' + | '/api/multiple-cookies' + | '/api/null-body-status' + | '/api/readonly-after-next' + | '/api/redirect-with-cookies' + | '/api/remove-returned-header' + | '/api/replace-after-direct-mutation' + | '/api/replace-explicit-set-cookie' + | '/api/route-after-next' + | '/api/route-before-next' + | '/api/same-boundary-conflict' + | '/api/status-contracts' + | '/api/throw-after-status' + | '/api/tracked-stream' + | '/api/tracked-stream-status' + | '/api/two-returned-responses' + id: + | '__root__' + | '/' + | '/server-functions' + | '/ssr' + | '/streamed' + | '/api/base' + | '/api/bulk-headers' + | '/api/clear-returned-headers' + | '/api/direct-mutation-visible' + | '/api/explicit-set-cookie-header' + | '/api/framing-error' + | '/api/get-response-header-helper' + | '/api/get-response-headers-helper' + | '/api/multiple-cookies' + | '/api/null-body-status' + | '/api/readonly-after-next' + | '/api/redirect-with-cookies' + | '/api/remove-returned-header' + | '/api/replace-after-direct-mutation' + | '/api/replace-explicit-set-cookie' + | '/api/route-after-next' + | '/api/route-before-next' + | '/api/same-boundary-conflict' + | '/api/status-contracts' + | '/api/throw-after-status' + | '/api/tracked-stream' + | '/api/tracked-stream-status' + | '/api/two-returned-responses' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ServerFunctionsRoute: typeof ServerFunctionsRoute + SsrRoute: typeof SsrRoute + StreamedRoute: typeof StreamedRoute + ApiBaseRoute: typeof ApiBaseRoute + ApiBulkHeadersRoute: typeof ApiBulkHeadersRoute + ApiClearReturnedHeadersRoute: typeof ApiClearReturnedHeadersRoute + ApiDirectMutationVisibleRoute: typeof ApiDirectMutationVisibleRoute + ApiExplicitSetCookieHeaderRoute: typeof ApiExplicitSetCookieHeaderRoute + ApiFramingErrorRoute: typeof ApiFramingErrorRoute + ApiGetResponseHeaderHelperRoute: typeof ApiGetResponseHeaderHelperRoute + ApiGetResponseHeadersHelperRoute: typeof ApiGetResponseHeadersHelperRoute + ApiMultipleCookiesRoute: typeof ApiMultipleCookiesRoute + ApiNullBodyStatusRoute: typeof ApiNullBodyStatusRoute + ApiReadonlyAfterNextRoute: typeof ApiReadonlyAfterNextRoute + ApiRedirectWithCookiesRoute: typeof ApiRedirectWithCookiesRoute + ApiRemoveReturnedHeaderRoute: typeof ApiRemoveReturnedHeaderRoute + ApiReplaceAfterDirectMutationRoute: typeof ApiReplaceAfterDirectMutationRoute + ApiReplaceExplicitSetCookieRoute: typeof ApiReplaceExplicitSetCookieRoute + ApiRouteAfterNextRoute: typeof ApiRouteAfterNextRoute + ApiRouteBeforeNextRoute: typeof ApiRouteBeforeNextRoute + ApiSameBoundaryConflictRoute: typeof ApiSameBoundaryConflictRoute + ApiStatusContractsRoute: typeof ApiStatusContractsRoute + ApiThrowAfterStatusRoute: typeof ApiThrowAfterStatusRoute + ApiTrackedStreamRoute: typeof ApiTrackedStreamRoute + ApiTrackedStreamStatusRoute: typeof ApiTrackedStreamStatusRoute + ApiTwoReturnedResponsesRoute: typeof ApiTwoReturnedResponsesRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/server-functions': { + id: '/server-functions' + path: '/server-functions' + fullPath: '/server-functions' + preLoaderRoute: typeof ServerFunctionsRouteImport + parentRoute: typeof rootRouteImport + } + '/ssr': { + id: '/ssr' + path: '/ssr' + fullPath: '/ssr' + preLoaderRoute: typeof SsrRouteImport + parentRoute: typeof rootRouteImport + } + '/streamed': { + id: '/streamed' + path: '/streamed' + fullPath: '/streamed' + preLoaderRoute: typeof StreamedRouteImport + parentRoute: typeof rootRouteImport + } + '/api/base': { + id: '/api/base' + path: '/api/base' + fullPath: '/api/base' + preLoaderRoute: typeof ApiBaseRouteImport + parentRoute: typeof rootRouteImport + } + '/api/bulk-headers': { + id: '/api/bulk-headers' + path: '/api/bulk-headers' + fullPath: '/api/bulk-headers' + preLoaderRoute: typeof ApiBulkHeadersRouteImport + parentRoute: typeof rootRouteImport + } + '/api/clear-returned-headers': { + id: '/api/clear-returned-headers' + path: '/api/clear-returned-headers' + fullPath: '/api/clear-returned-headers' + preLoaderRoute: typeof ApiClearReturnedHeadersRouteImport + parentRoute: typeof rootRouteImport + } + '/api/direct-mutation-visible': { + id: '/api/direct-mutation-visible' + path: '/api/direct-mutation-visible' + fullPath: '/api/direct-mutation-visible' + preLoaderRoute: typeof ApiDirectMutationVisibleRouteImport + parentRoute: typeof rootRouteImport + } + '/api/explicit-set-cookie-header': { + id: '/api/explicit-set-cookie-header' + path: '/api/explicit-set-cookie-header' + fullPath: '/api/explicit-set-cookie-header' + preLoaderRoute: typeof ApiExplicitSetCookieHeaderRouteImport + parentRoute: typeof rootRouteImport + } + '/api/framing-error': { + id: '/api/framing-error' + path: '/api/framing-error' + fullPath: '/api/framing-error' + preLoaderRoute: typeof ApiFramingErrorRouteImport + parentRoute: typeof rootRouteImport + } + '/api/get-response-header-helper': { + id: '/api/get-response-header-helper' + path: '/api/get-response-header-helper' + fullPath: '/api/get-response-header-helper' + preLoaderRoute: typeof ApiGetResponseHeaderHelperRouteImport + parentRoute: typeof rootRouteImport + } + '/api/get-response-headers-helper': { + id: '/api/get-response-headers-helper' + path: '/api/get-response-headers-helper' + fullPath: '/api/get-response-headers-helper' + preLoaderRoute: typeof ApiGetResponseHeadersHelperRouteImport + parentRoute: typeof rootRouteImport + } + '/api/multiple-cookies': { + id: '/api/multiple-cookies' + path: '/api/multiple-cookies' + fullPath: '/api/multiple-cookies' + preLoaderRoute: typeof ApiMultipleCookiesRouteImport + parentRoute: typeof rootRouteImport + } + '/api/null-body-status': { + id: '/api/null-body-status' + path: '/api/null-body-status' + fullPath: '/api/null-body-status' + preLoaderRoute: typeof ApiNullBodyStatusRouteImport + parentRoute: typeof rootRouteImport + } + '/api/readonly-after-next': { + id: '/api/readonly-after-next' + path: '/api/readonly-after-next' + fullPath: '/api/readonly-after-next' + preLoaderRoute: typeof ApiReadonlyAfterNextRouteImport + parentRoute: typeof rootRouteImport + } + '/api/redirect-with-cookies': { + id: '/api/redirect-with-cookies' + path: '/api/redirect-with-cookies' + fullPath: '/api/redirect-with-cookies' + preLoaderRoute: typeof ApiRedirectWithCookiesRouteImport + parentRoute: typeof rootRouteImport + } + '/api/remove-returned-header': { + id: '/api/remove-returned-header' + path: '/api/remove-returned-header' + fullPath: '/api/remove-returned-header' + preLoaderRoute: typeof ApiRemoveReturnedHeaderRouteImport + parentRoute: typeof rootRouteImport + } + '/api/replace-after-direct-mutation': { + id: '/api/replace-after-direct-mutation' + path: '/api/replace-after-direct-mutation' + fullPath: '/api/replace-after-direct-mutation' + preLoaderRoute: typeof ApiReplaceAfterDirectMutationRouteImport + parentRoute: typeof rootRouteImport + } + '/api/replace-explicit-set-cookie': { + id: '/api/replace-explicit-set-cookie' + path: '/api/replace-explicit-set-cookie' + fullPath: '/api/replace-explicit-set-cookie' + preLoaderRoute: typeof ApiReplaceExplicitSetCookieRouteImport + parentRoute: typeof rootRouteImport + } + '/api/route-after-next': { + id: '/api/route-after-next' + path: '/api/route-after-next' + fullPath: '/api/route-after-next' + preLoaderRoute: typeof ApiRouteAfterNextRouteImport + parentRoute: typeof rootRouteImport + } + '/api/route-before-next': { + id: '/api/route-before-next' + path: '/api/route-before-next' + fullPath: '/api/route-before-next' + preLoaderRoute: typeof ApiRouteBeforeNextRouteImport + parentRoute: typeof rootRouteImport + } + '/api/same-boundary-conflict': { + id: '/api/same-boundary-conflict' + path: '/api/same-boundary-conflict' + fullPath: '/api/same-boundary-conflict' + preLoaderRoute: typeof ApiSameBoundaryConflictRouteImport + parentRoute: typeof rootRouteImport + } + '/api/status-contracts': { + id: '/api/status-contracts' + path: '/api/status-contracts' + fullPath: '/api/status-contracts' + preLoaderRoute: typeof ApiStatusContractsRouteImport + parentRoute: typeof rootRouteImport + } + '/api/throw-after-status': { + id: '/api/throw-after-status' + path: '/api/throw-after-status' + fullPath: '/api/throw-after-status' + preLoaderRoute: typeof ApiThrowAfterStatusRouteImport + parentRoute: typeof rootRouteImport + } + '/api/tracked-stream': { + id: '/api/tracked-stream' + path: '/api/tracked-stream' + fullPath: '/api/tracked-stream' + preLoaderRoute: typeof ApiTrackedStreamRouteImport + parentRoute: typeof rootRouteImport + } + '/api/tracked-stream-status': { + id: '/api/tracked-stream-status' + path: '/api/tracked-stream-status' + fullPath: '/api/tracked-stream-status' + preLoaderRoute: typeof ApiTrackedStreamStatusRouteImport + parentRoute: typeof rootRouteImport + } + '/api/two-returned-responses': { + id: '/api/two-returned-responses' + path: '/api/two-returned-responses' + fullPath: '/api/two-returned-responses' + preLoaderRoute: typeof ApiTwoReturnedResponsesRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ServerFunctionsRoute: ServerFunctionsRoute, + SsrRoute: SsrRoute, + StreamedRoute: StreamedRoute, + ApiBaseRoute: ApiBaseRoute, + ApiBulkHeadersRoute: ApiBulkHeadersRoute, + ApiClearReturnedHeadersRoute: ApiClearReturnedHeadersRoute, + ApiDirectMutationVisibleRoute: ApiDirectMutationVisibleRoute, + ApiExplicitSetCookieHeaderRoute: ApiExplicitSetCookieHeaderRoute, + ApiFramingErrorRoute: ApiFramingErrorRoute, + ApiGetResponseHeaderHelperRoute: ApiGetResponseHeaderHelperRoute, + ApiGetResponseHeadersHelperRoute: ApiGetResponseHeadersHelperRoute, + ApiMultipleCookiesRoute: ApiMultipleCookiesRoute, + ApiNullBodyStatusRoute: ApiNullBodyStatusRoute, + ApiReadonlyAfterNextRoute: ApiReadonlyAfterNextRoute, + ApiRedirectWithCookiesRoute: ApiRedirectWithCookiesRoute, + ApiRemoveReturnedHeaderRoute: ApiRemoveReturnedHeaderRoute, + ApiReplaceAfterDirectMutationRoute: ApiReplaceAfterDirectMutationRoute, + ApiReplaceExplicitSetCookieRoute: ApiReplaceExplicitSetCookieRoute, + ApiRouteAfterNextRoute: ApiRouteAfterNextRoute, + ApiRouteBeforeNextRoute: ApiRouteBeforeNextRoute, + ApiSameBoundaryConflictRoute: ApiSameBoundaryConflictRoute, + ApiStatusContractsRoute: ApiStatusContractsRoute, + ApiThrowAfterStatusRoute: ApiThrowAfterStatusRoute, + ApiTrackedStreamRoute: ApiTrackedStreamRoute, + ApiTrackedStreamStatusRoute: ApiTrackedStreamStatusRoute, + ApiTwoReturnedResponsesRoute: ApiTwoReturnedResponsesRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { startInstance } from './start.ts' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + config: Awaited> + } +} diff --git a/e2e/react-start/response-reconciliation/src/router.tsx b/e2e/react-start/response-reconciliation/src/router.tsx new file mode 100644 index 0000000000..c5c2209e5a --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/router.tsx @@ -0,0 +1,13 @@ +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' +import { NotFound } from './components/NotFound' + +export function getRouter() { + return createRouter({ + routeTree, + defaultErrorComponent: DefaultCatchBoundary, + defaultNotFoundComponent: () => , + scrollRestoration: true, + }) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/__root.tsx b/e2e/react-start/response-reconciliation/src/routes/__root.tsx new file mode 100644 index 0000000000..a562991887 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/__root.tsx @@ -0,0 +1,57 @@ +/// +import * as React from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' +import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { NotFound } from '~/components/NotFound' +import '~/styles/app.css' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + ], + }), + errorComponent: (props) => { + return ( + + + + ) + }, + notFoundComponent: () => , + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + ) +} + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + + + {children} + + + + ) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/api/-response.ts b/e2e/react-start/response-reconciliation/src/routes/api/-response.ts new file mode 100644 index 0000000000..54082c10f6 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/-response.ts @@ -0,0 +1,85 @@ +import { createMiddleware } from '@tanstack/react-start' +import { + getResponseHeader, + setResponseHeader, + setResponseStatus, +} from '@tanstack/react-start/server' + +function getScenario(request: Request) { + const url = new URL(request.url) + return url.pathname.split('/').pop() || '' +} + +export function baseResponse(scenario: string) { + return new Response(scenario, { + headers: { 'x-handler': scenario, 'x-base': 'yes' }, + }) +} + +export const routeBoundaryMiddleware = createMiddleware().server( + async ({ next, request }) => { + const scenario = getScenario(request) + + if (scenario === 'route-before-next') { + setResponseHeader('x-route-before', 'yes') + setResponseStatus(234, 'route-before') + return next() + } + + if (scenario === 'route-after-next') { + const result = await next() + setResponseHeader('x-route-after', 'yes') + setResponseStatus(233, 'route-after') + return result + } + + if (scenario === 'direct-mutation-visible') { + const result = await next() + result.response.headers.set('x-direct-visible', 'yes') + setResponseHeader( + 'x-direct-read', + getResponseHeader('x-direct-visible') || 'missing', + ) + return result + } + + if (scenario === 'replace-after-direct-mutation') { + const result = await next() + result.response.headers.set('x-direct-a', 'yes') + setResponseHeader('x-helper-delta', 'yes') + return new Response('replacement', { + status: 202, + headers: { 'x-response-b': 'yes' }, + }) + } + + if (scenario === 'two-returned-responses') { + await next() + setResponseHeader('x-helper-after-a', 'yes') + return new Response('response-b', { + headers: { 'x-response-b': 'yes' }, + }) + } + + if (scenario === 'readonly-after-next') { + const result = await next() + setResponseHeader('x-readonly-after', 'yes') + return result + } + + return next() + }, +) + +export const returnedResponseMiddleware = createMiddleware().server( + async ({ next, request }) => { + if (getScenario(request) === 'two-returned-responses') { + await next() + return new Response('response-a', { + headers: { 'x-response-a': 'yes' }, + }) + } + + return next() + }, +) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/-tracked-streams.ts b/e2e/react-start/response-reconciliation/src/routes/api/-tracked-streams.ts new file mode 100644 index 0000000000..1ccde76367 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/-tracked-streams.ts @@ -0,0 +1,2 @@ +// Ids of tracked response streams that were cancelled, kept by the server. +export const cancelledStreams = new Set() diff --git a/e2e/react-start/response-reconciliation/src/routes/api/-upstream.ts b/e2e/react-start/response-reconciliation/src/routes/api/-upstream.ts new file mode 100644 index 0000000000..0018376035 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/-upstream.ts @@ -0,0 +1,14 @@ +// An upstream reply whose headers describe its own body and client. Start must +// not copy them onto the error body it generates for this failure. +export function createUpstreamFailure() { + return new Response('

upstream

', { + status: 502, + headers: { + 'content-encoding': 'gzip', + 'content-length': '999', + 'content-type': 'text/html', + 'set-cookie': 'upstream-session=leaked; Path=/', + 'x-upstream': 'yes', + }, + }) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/api/base.ts b/e2e/react-start/response-reconciliation/src/routes/api/base.ts new file mode 100644 index 0000000000..62f706a9f1 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/base.ts @@ -0,0 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' +import { baseResponse } from './-response' + +export const Route = createFileRoute('/api/base')({ + server: { + handlers: { + GET: () => baseResponse('base'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/bulk-headers.ts b/e2e/react-start/response-reconciliation/src/routes/api/bulk-headers.ts new file mode 100644 index 0000000000..db7ded6c54 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/bulk-headers.ts @@ -0,0 +1,19 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseHeaders } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/bulk-headers')({ + server: { + handlers: { + GET: () => { + const headers = new Headers({ + 'x-bulk-one': '1', + 'x-bulk-two': '2', + }) + headers.append('set-cookie', 'bulk-one=1; Path=/') + headers.append('set-cookie', 'bulk-two=2; Path=/') + setResponseHeaders(headers) + return new Response('bulk', { headers: { 'x-keep': 'yes' } }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/clear-returned-headers.ts b/e2e/react-start/response-reconciliation/src/routes/api/clear-returned-headers.ts new file mode 100644 index 0000000000..fd3b88c172 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/clear-returned-headers.ts @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' +import { clearResponseHeaders } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/clear-returned-headers')({ + server: { + handlers: { + GET: () => { + clearResponseHeaders() + return new Response('clear', { + headers: { 'x-clear-one': '1', 'x-clear-two': '2' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/direct-mutation-visible.ts b/e2e/react-start/response-reconciliation/src/routes/api/direct-mutation-visible.ts new file mode 100644 index 0000000000..96823887e5 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/direct-mutation-visible.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { baseResponse, routeBoundaryMiddleware } from './-response' + +export const Route = createFileRoute('/api/direct-mutation-visible')({ + server: { + middleware: [routeBoundaryMiddleware], + handlers: { + GET: () => baseResponse('direct-mutation-visible'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/explicit-set-cookie-header.ts b/e2e/react-start/response-reconciliation/src/routes/api/explicit-set-cookie-header.ts new file mode 100644 index 0000000000..3ea2bc6d75 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/explicit-set-cookie-header.ts @@ -0,0 +1,16 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseHeader } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/explicit-set-cookie-header')({ + server: { + handlers: { + GET: () => { + setResponseHeader('set-cookie', [ + 'explicit-one=1; Path=/', + 'explicit-two=2; Path=/', + ]) + return new Response('explicit') + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/framing-error.ts b/e2e/react-start/response-reconciliation/src/routes/api/framing-error.ts new file mode 100644 index 0000000000..baeab15780 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/framing-error.ts @@ -0,0 +1,16 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseHeader } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/framing-error')({ + server: { + handlers: { + GET: async () => { + // Headers for a compressed file whose read then fails. + setResponseHeader('content-encoding', 'gzip') + setResponseHeader('content-length', '2') + await Promise.resolve() + throw new Error('File read failed') + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/get-response-header-helper.ts b/e2e/react-start/response-reconciliation/src/routes/api/get-response-header-helper.ts new file mode 100644 index 0000000000..b597882ff6 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/get-response-header-helper.ts @@ -0,0 +1,17 @@ +import { createFileRoute } from '@tanstack/react-router' +import { + getResponseHeader, + setResponseHeader, +} from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/get-response-header-helper')({ + server: { + handlers: { + GET: () => { + setResponseHeader('x-helper-visible', 'yes') + const value = getResponseHeader('x-helper-visible') || 'missing' + return new Response(value, { headers: { 'x-read-after-set': value } }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/get-response-headers-helper.ts b/e2e/react-start/response-reconciliation/src/routes/api/get-response-headers-helper.ts new file mode 100644 index 0000000000..168d38bad4 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/get-response-headers-helper.ts @@ -0,0 +1,20 @@ +import { createFileRoute } from '@tanstack/react-router' +import { + getResponseHeaders, + setResponseHeader, +} from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/get-response-headers-helper')({ + server: { + handlers: { + GET: () => { + setResponseHeader('x-headers-helper-visible', 'yes') + // Exercise an untyped caller mutating its detached snapshot. + const headers = getResponseHeaders() as Headers + const value = headers.get('x-headers-helper-visible') || 'missing' + headers.set('x-headers-snapshot-write', 'ignored') + return new Response(value, { headers: { 'x-headers-read': value } }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/multiple-cookies.ts b/e2e/react-start/response-reconciliation/src/routes/api/multiple-cookies.ts new file mode 100644 index 0000000000..eebf7a167e --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/multiple-cookies.ts @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setCookie } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/multiple-cookies')({ + server: { + handlers: { + GET: () => { + setCookie('route-one', '1', { path: '/' }) + setCookie('route-two', '2', { path: '/' }) + return new Response('cookies') + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/null-body-status.ts b/e2e/react-start/response-reconciliation/src/routes/api/null-body-status.ts new file mode 100644 index 0000000000..d11056e7a8 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/null-body-status.ts @@ -0,0 +1,18 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseStatus } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/null-body-status')({ + server: { + handlers: { + GET: ({ request }) => { + const statusParam = new URL(request.url).searchParams.get('status') + const status = + statusParam === '205' ? 205 : statusParam === '304' ? 304 : 204 + setResponseStatus(status) + return new Response('should-drop', { + headers: { 'x-null-body': 'yes' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/readonly-after-next.ts b/e2e/react-start/response-reconciliation/src/routes/api/readonly-after-next.ts new file mode 100644 index 0000000000..7b42955052 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/readonly-after-next.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { routeBoundaryMiddleware } from './-response' + +export const Route = createFileRoute('/api/readonly-after-next')({ + server: { + middleware: [routeBoundaryMiddleware], + handlers: { + GET: () => fetch('data:text/plain,readonly'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/redirect-with-cookies.ts b/e2e/react-start/response-reconciliation/src/routes/api/redirect-with-cookies.ts new file mode 100644 index 0000000000..5b0072f35a --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/redirect-with-cookies.ts @@ -0,0 +1,18 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setCookie } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/redirect-with-cookies')({ + server: { + handlers: { + GET: () => { + setCookie('redirect-one', '1', { path: '/' }) + setCookie('redirect-two', '2', { path: '/' }) + setCookie('redirect-three', '3', { path: '/' }) + return new Response(null, { + status: 307, + headers: { Location: '/api/base' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/remove-returned-header.ts b/e2e/react-start/response-reconciliation/src/routes/api/remove-returned-header.ts new file mode 100644 index 0000000000..96f82bf98d --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/remove-returned-header.ts @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' +import { removeResponseHeader } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/remove-returned-header')({ + server: { + handlers: { + GET: () => { + removeResponseHeader('x-remove-me') + return new Response('remove', { + headers: { 'x-remove-me': 'response', 'x-keep': 'yes' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/replace-after-direct-mutation.ts b/e2e/react-start/response-reconciliation/src/routes/api/replace-after-direct-mutation.ts new file mode 100644 index 0000000000..890280483d --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/replace-after-direct-mutation.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { baseResponse, routeBoundaryMiddleware } from './-response' + +export const Route = createFileRoute('/api/replace-after-direct-mutation')({ + server: { + middleware: [routeBoundaryMiddleware], + handlers: { + GET: () => baseResponse('replace-after-direct-mutation'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/replace-explicit-set-cookie.ts b/e2e/react-start/response-reconciliation/src/routes/api/replace-explicit-set-cookie.ts new file mode 100644 index 0000000000..97df27d915 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/replace-explicit-set-cookie.ts @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseHeader } from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/replace-explicit-set-cookie')({ + server: { + handlers: { + GET: () => { + setResponseHeader('set-cookie', 'explicit-new=1; Path=/') + return new Response('explicit', { + headers: { 'set-cookie': 'explicit-old=1; Path=/' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/route-after-next.ts b/e2e/react-start/response-reconciliation/src/routes/api/route-after-next.ts new file mode 100644 index 0000000000..7d3650147f --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/route-after-next.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { baseResponse, routeBoundaryMiddleware } from './-response' + +export const Route = createFileRoute('/api/route-after-next')({ + server: { + middleware: [routeBoundaryMiddleware], + handlers: { + GET: () => baseResponse('route-after-next'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/route-before-next.ts b/e2e/react-start/response-reconciliation/src/routes/api/route-before-next.ts new file mode 100644 index 0000000000..b52c7642af --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/route-before-next.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { baseResponse, routeBoundaryMiddleware } from './-response' + +export const Route = createFileRoute('/api/route-before-next')({ + server: { + middleware: [routeBoundaryMiddleware], + handlers: { + GET: () => baseResponse('route-before-next'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/same-boundary-conflict.ts b/e2e/react-start/response-reconciliation/src/routes/api/same-boundary-conflict.ts new file mode 100644 index 0000000000..7ac086d652 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/same-boundary-conflict.ts @@ -0,0 +1,21 @@ +import { createFileRoute } from '@tanstack/react-router' +import { + setResponseHeader, + setResponseStatus, +} from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/same-boundary-conflict')({ + server: { + handlers: { + GET: () => { + setResponseStatus(235, 'same-boundary') + setResponseHeader('x-conflict', 'helper') + return new Response('conflict', { + status: 201, + statusText: 'response-status', + headers: { 'x-conflict': 'response' }, + }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/status-contracts.ts b/e2e/react-start/response-reconciliation/src/routes/api/status-contracts.ts new file mode 100644 index 0000000000..43fd72ec07 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/status-contracts.ts @@ -0,0 +1,42 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setResponseStatus } from '@tanstack/react-start/server' +import { createUpstreamFailure } from './-upstream' + +export const Route = createFileRoute('/api/status-contracts')({ + server: { + handlers: { + GET: async ({ request }) => { + const scenario = new URL(request.url).searchParams.get('scenario') + + if (scenario === 'invalid-status-return') { + setResponseStatus(999, 'Ignored') + return new Response('missing', { + status: 404, + statusText: 'Not Found', + }) + } + + if (scenario === 'invalid-status-throw') { + setResponseStatus(101) + throw new Error('Unexpected status contract failure') + } + + if (scenario === 'slow') { + await new Promise((resolve) => setTimeout(resolve, 150)) + return new Response('slow result') + } + + if (scenario === 'helper-success-crash') { + setResponseStatus(201, 'Created') + throw new Error('Crash after a success status') + } + + if (scenario === 'upstream-error-cause') { + throw new Error('Upstream failed', { cause: createUpstreamFailure() }) + } + + return new Response(`Unknown scenario: ${scenario}`, { status: 400 }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/throw-after-status.ts b/e2e/react-start/response-reconciliation/src/routes/api/throw-after-status.ts new file mode 100644 index 0000000000..9d93d75b61 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/throw-after-status.ts @@ -0,0 +1,26 @@ +import { createFileRoute } from '@tanstack/react-router' +import { + setCookie, + setResponseHeader, + setResponseStatus, +} from '@tanstack/react-start/server' + +export const Route = createFileRoute('/api/throw-after-status')({ + server: { + handlers: { + GET: ({ request }) => { + const url = new URL(request.url) + setResponseStatus(401, 'Unauthorized') + setResponseHeader('x-error-helper', 'yes') + setCookie('throw-after-status', '1', { path: '/' }) + if (url.searchParams.get('throw') === 'response') { + throw new Response('Unauthorized response', { + status: 200, + headers: { 'x-thrown-response': 'yes' }, + }) + } + throw new Error('Unauthorized route') + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream-status.ts b/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream-status.ts new file mode 100644 index 0000000000..1aaffd8d36 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream-status.ts @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { cancelledStreams } from './-tracked-streams' + +export const Route = createFileRoute('/api/tracked-stream-status')({ + server: { + handlers: { + GET: ({ request }) => { + const id = new URL(request.url).searchParams.get('id') ?? '' + return Response.json({ cancelled: cancelledStreams.has(id) }) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream.ts b/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream.ts new file mode 100644 index 0000000000..640074a035 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream.ts @@ -0,0 +1,23 @@ +import { createFileRoute } from '@tanstack/react-router' +import { cancelledStreams } from './-tracked-streams' + +export const Route = createFileRoute('/api/tracked-stream')({ + server: { + handlers: { + // A body that never ends, like a live feed. Only cancellation stops it. + GET: ({ request }) => { + const id = new URL(request.url).searchParams.get('id') ?? '' + return new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('tracked')) + }, + cancel() { + cancelledStreams.add(id) + }, + }), + ) + }, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/api/two-returned-responses.ts b/e2e/react-start/response-reconciliation/src/routes/api/two-returned-responses.ts new file mode 100644 index 0000000000..f433778fd8 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/api/two-returned-responses.ts @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' +import { + baseResponse, + returnedResponseMiddleware, + routeBoundaryMiddleware, +} from './-response' + +export const Route = createFileRoute('/api/two-returned-responses')({ + server: { + middleware: [routeBoundaryMiddleware, returnedResponseMiddleware], + handlers: { + GET: () => baseResponse('two-returned-responses'), + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/routes/index.tsx b/e2e/react-start/response-reconciliation/src/routes/index.tsx new file mode 100644 index 0000000000..ab938397e9 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/index.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/')({ + headers: () => ({ 'x-route-header': 'present' }), + component: Home, +}) + +function Home() { + return ( +
+

Response Reconciliation E2E

+

This app contains HTTP-level regression tests.

+
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/server-functions.tsx b/e2e/react-start/response-reconciliation/src/routes/server-functions.tsx new file mode 100644 index 0000000000..580309b31e --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/server-functions.tsx @@ -0,0 +1,285 @@ +import { ClientOnly, createFileRoute, redirect } from '@tanstack/react-router' +import { + createMiddleware, + createServerFn, + useServerFn, +} from '@tanstack/react-start' +import * as React from 'react' +import { + getResponseHeader, + setCookie, + setResponseHeader, + setResponseHeaders, + setResponseStatus, +} from '@tanstack/react-start/server' + +const functionAfterNextMiddleware = createMiddleware({ + type: 'function', +}).server(async ({ next }) => { + const result = await next() + setResponseHeader('x-function-after', 'yes') + setResponseStatus(236, 'function-after') + return result +}) + +const rawResponseAfterNextMiddleware = createMiddleware({ + type: 'function', +}).server(async ({ next }) => { + const result = await next() + setResponseHeader('x-function-raw-after', 'yes') + setResponseStatus(237, 'function-raw-after') + return result +}) + +const throwStatusMiddleware = createMiddleware({ + type: 'function', +}).server(() => { + setResponseStatus(401, 'Unauthorized') + setResponseHeader('x-function-error-middleware', 'yes') + throw new Error('Unauthorized function middleware') +}) + +const replacementMiddleware = createMiddleware({ + type: 'function', +}).server(async ({ next }) => { + const result = await next() + const resultWithResponse = result as typeof result & { result?: unknown } + if (!(resultWithResponse.result instanceof Response)) { + throw new Error('Expected replacement test to observe a Response') + } + resultWithResponse.result.headers.set('x-function-a', 'yes') + setResponseHeader('x-function-helper-delta', 'yes') + // Function middleware types don't model raw Response replacement, but the + // middleware executor supports it; this fixture deliberately exercises that + // runtime path. + return new Response('function-b', { + headers: { 'x-function-b': 'yes' }, + }) as never +}) + +const globalSerializedFn = createServerFn().handler(() => { + return { ok: true } +}) + +const functionAfterNextFn = createServerFn() + .middleware([functionAfterNextMiddleware]) + .handler(() => { + return { ok: true } + }) + +const rawResponseAfterNextFn = createServerFn() + .middleware([rawResponseAfterNextMiddleware]) + .handler(() => { + return new Response('raw function body', { + headers: { 'x-function-raw': 'yes' }, + }) + }) + +const replacementFn = createServerFn() + .middleware([replacementMiddleware]) + .handler(() => { + return new Response('function-a') + }) + +const multipleCookiesFn = createServerFn().handler(() => { + setCookie('fn-one', '1', { path: '/' }) + setCookie('fn-two', '2', { path: '/' }) + return { ok: true } +}) + +const rawMultipleCookiesFn = createServerFn().handler(() => { + setCookie('fn-raw-helper-one', '1', { path: '/' }) + setCookie('fn-raw-helper-two', '2', { path: '/' }) + const headers = new Headers() + headers.append('set-cookie', 'fn-raw-returned-one=1; Path=/') + headers.append('set-cookie', 'fn-raw-returned-two=2; Path=/') + return new Response('raw cookie body', { headers }) +}) + +const explicitCookieHeaderFn = createServerFn().handler(() => { + setResponseHeader('set-cookie', [ + 'fn-explicit-one=1; Path=/', + 'fn-explicit-two=2; Path=/', + ]) + return { ok: true } +}) + +const throwAfterStatusFn = createServerFn().handler(() => { + setResponseStatus(401, 'Unauthorized') + setResponseHeader('x-function-error', 'yes') + throw new Error('Unauthorized function') +}) + +const throwAfterFramingFn = createServerFn().handler(async () => { + // Headers for a compressed file whose read then fails. + setResponseHeader('content-encoding', 'gzip') + setResponseHeader('content-length', '2') + await Promise.resolve() + throw new Error('File read failed') +}) + +const throwAfterMiddlewareStatusFn = createServerFn() + .middleware([throwStatusMiddleware]) + .handler(() => { + return { ok: true } + }) + +const transportProtectedFn = createServerFn().handler(() => { + setResponseHeaders( + new Headers({ + 'content-type': 'text/plain', + 'x-tss-serialized': 'false', + 'x-user-header': 'yes', + }), + ) + return { ok: true } +}) + +const readAfterSetFn = createServerFn().handler(() => { + setResponseHeader('x-read-after-set', 'yes') + setResponseHeader( + 'x-read-after-set-value', + getResponseHeader('x-read-after-set') || 'missing', + ) + return { ok: true } +}) + +const returnRedirectFn = createServerFn().handler(() => { + setResponseStatus(302, 'Continue') + setResponseHeaders( + new Headers({ + 'content-type': 'text/plain', + 'x-tss-raw': 'true', + 'x-tss-serialized': 'true', + location: '/middleware-target', + }), + ) + setCookie('rpc-redirect', 'committed', { path: '/' }) + return redirect({ to: '/' }) +}) + +const throwRedirectFn = createServerFn().handler(() => { + setResponseStatus(302, 'Continue') + setResponseHeaders( + new Headers({ + 'content-type': 'text/plain', + 'x-tss-raw': 'true', + 'x-tss-serialized': 'true', + location: '/middleware-target', + }), + ) + setCookie('rpc-redirect', 'committed', { path: '/' }) + throw redirect({ to: '/' }) +}) + +const bodylessStatusFn = createServerFn().handler(() => { + setResponseStatus(204, 'No Content') + setResponseHeader('x-bodyless-status', 'ignored') + return { ok: true } +}) + +const throwZeroFn = createServerFn().handler(() => { + throw 0 +}) + +const throwResponseFn = createServerFn().handler(() => { + throw new Response('teapot', { status: 418 }) +}) + +const helperLocationFn = createServerFn().handler(() => { + setResponseStatus(302) + setResponseHeader('location', '/api/base') + return { ok: true } +}) + +export const Route = createFileRoute('/server-functions')({ + component: ServerFunctions, +}) + +function ServerFunctions() { + return ( +
+

Server Functions

+ + + + + + + + + + + + + + + + + + + + +
+ ) +} + +function ServerFunctionButton({ + name, + fn, +}: { + name: string + fn: (...args: Array) => Promise +}) { + const serverFn = useServerFn(fn) + const [result, setResult] = React.useState('idle') + + return ( +
+ + {result} +
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/ssr.tsx b/e2e/react-start/response-reconciliation/src/routes/ssr.tsx new file mode 100644 index 0000000000..c0cb69c8ec --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/ssr.tsx @@ -0,0 +1,29 @@ +import { createFileRoute } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import { + setCookie, + setResponseHeader, + setResponseStatus, +} from '@tanstack/react-start/server' + +const setSsrResponseFn = createServerFn().handler(() => { + setResponseStatus(238, 'ssr-loader') + setResponseHeader('x-ssr-loader', 'yes') + setCookie('ssr-one', '1', { path: '/' }) + setCookie('ssr-two', '2', { path: '/' }) + return { message: 'ssr response' } +}) + +export const Route = createFileRoute('/ssr')({ + loader: () => setSsrResponseFn(), + component: SsrRoute, +}) + +function SsrRoute() { + const data = Route.useLoaderData() + return ( +
+

{data.message}

+
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/routes/streamed.tsx b/e2e/react-start/response-reconciliation/src/routes/streamed.tsx new file mode 100644 index 0000000000..8d6a6227cd --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/routes/streamed.tsx @@ -0,0 +1,25 @@ +import { Await, createFileRoute } from '@tanstack/react-router' +import { Suspense } from 'react' + +export const Route = createFileRoute('/streamed')({ + loader: () => ({ + deferred: new Promise((resolve) => + setTimeout(() => resolve('streamed after the shell'), 100), + ), + }), + component: StreamedRoute, +}) + +function StreamedRoute() { + const { deferred } = Route.useLoaderData() + return ( +
+

Streamed document

+ loading

}> + + {(value) =>

{value}

} +
+
+
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/server-entry.ts b/e2e/react-start/response-reconciliation/src/server-entry.ts new file mode 100644 index 0000000000..cbee8ad31a --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/server-entry.ts @@ -0,0 +1,84 @@ +import { + createStartHandler, + defaultStreamHandler, + getResponseStatus, + handleStartError, +} from '@tanstack/react-start/server' +import handler, { createServerEntry } from '@tanstack/react-start/server-entry' + +const uncaughtFetch = createStartHandler(defaultStreamHandler) + +// Reproduce #7647's custom stream handler that preserves middleware status. +const preserveStatusFetch = createStartHandler(async (ctx) => { + const result = await defaultStreamHandler(ctx) + const response = result instanceof Response ? result : result.response + const status = getResponseStatus() + if (status === response.status) { + return result + } + + const headers = new Headers(response.headers) + headers.set('x-stream-response-rebuilt', 'yes') + const replacement = new Response(response.body, { + status, + statusText: response.statusText, + headers, + }) + return result instanceof Response + ? replacement + : { ...result, response: replacement } +}) + +function markCustomServerEntry(response: Response): Response { + try { + response.headers.set('x-custom-server-entry', 'yes') + return response + } catch { + const headers = new Headers(response.headers) + headers.set('x-custom-server-entry', 'yes') + return new Response(response.body, { + status: response.status, + statusText: response.statusText, + headers, + }) + } +} + +export default createServerEntry({ + async fetch(request, opts) { + if (request.headers.get('x-reconciliation-scenario') === 'issue-7647') { + return markCustomServerEntry(await preserveStatusFetch(request, opts)) + } + + if (request.headers.get('x-custom-handle-errors') === 'false') { + try { + return markCustomServerEntry(await uncaughtFetch(request, opts)) + } catch (error) { + if (request.headers.get('x-custom-handle-start-error') === 'true') { + return markCustomServerEntry(handleStartError(error)) + } + return markCustomServerEntry( + new Response(error instanceof Error ? error.message : 'error', { + status: 555, + headers: { + 'x-custom-entry-catch': 'yes', + }, + }), + ) + } + } + + try { + return markCustomServerEntry(await handler.fetch(request, opts)) + } catch (error) { + return markCustomServerEntry( + new Response(error instanceof Error ? error.message : 'error', { + status: 556, + headers: { + 'x-custom-entry-catch': 'unexpected', + }, + }), + ) + } + }, +}) diff --git a/e2e/react-start/response-reconciliation/src/start.ts b/e2e/react-start/response-reconciliation/src/start.ts new file mode 100644 index 0000000000..2ac158b799 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/start.ts @@ -0,0 +1,170 @@ +import { createMiddleware, createStart } from '@tanstack/react-start' +import { + clearResponseHeaders, + setCookie, + getCookie, + setResponseHeader, + setResponseHeaders, + setResponseStatus, +} from '@tanstack/react-start/server' +import { createUpstreamFailure } from './routes/api/-upstream' +import { installResponseWrapper } from './response-wrapper' + +const globalResponseMiddleware = createMiddleware().server( + async ({ next, request }) => { + if (request.headers.get('x-wrap-response') === 'true') { + installResponseWrapper() + } + + const scenario = + request.headers.get('x-reconciliation-scenario') || + getCookie('reconciliation-scenario') + + if (scenario === 'issue-7647') { + setResponseStatus(418) + setResponseHeader('x-middleware-header', 'present') + setResponseHeader('cache-control', 'no-store') + return next() + } + + if (scenario === 'global-before') { + setResponseHeaders( + new Headers({ + 'x-global-before': 'yes', + 'x-global-common': 'before', + }), + ) + setResponseStatus(231, 'global-before') + return next() + } + + if (scenario === 'global-after') { + const result = await next() + setResponseHeader('x-global-after', 'yes') + setResponseHeader('x-global-common', 'after') + setResponseStatus(232, 'global-after') + return result + } + + if (scenario === 'global-multiple-cookies') { + setCookie('global-one', '1', { path: '/' }) + setCookie('global-two', '2', { path: '/' }) + return next() + } + + if (scenario === 'global-upstream-cause') { + throw new Error('Upstream failed', { cause: createUpstreamFailure() }) + } + + if (scenario === 'global-location-error') { + throw Object.assign(new Error('Moved error'), { + status: 302, + headers: { location: '/api/base' }, + }) + } + + if (scenario === 'global-same-body-wrapper') { + const result = await next() + const wrapped = new Response(result.response.body, result.response) + clearResponseHeaders() + setResponseHeader('x-same-body-wrapper', 'yes') + return { ...result, response: wrapped } + } + + if (scenario === 'global-copy') { + // Session middleware copies the response to add a header (#8627). + const result = await next() + const headers = new Headers(result.response.headers) + headers.set('x-global-copy', 'yes') + return { + ...result, + response: new Response(result.response.body, { + status: result.response.status, + statusText: result.response.statusText, + headers, + }), + } + } + + if (scenario === 'global-piped-copy') { + const result = await next() + const response = new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ) + response.headers.set('x-global-piped-copy', 'yes') + return { ...result, response } + } + + if (scenario === 'global-representation') { + // Representation metadata computed from the body, as by ETag middleware. + const result = await next() + const body = await result.response.text() + const response = new Response(body, result.response) + response.headers.set('x-body-length', String(body.length)) + return { ...result, response } + } + + if (scenario === 'global-assigned-transform-not-modified') { + // Transform the body in place, then answer an ETag match instead. + const result = await next() + result.response = new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ) + return new Response(null, { status: 304 }) + } + + if (scenario === 'global-timeout') { + // Keep working after next() while the handler the inner timeout + // abandoned is still running. + const result = await next() + await sleep(400) + return result + } + + if (scenario === 'global-throw') { + setResponseStatus(401, 'Unauthorized') + setResponseHeader('x-global-error', 'yes') + throw new Error('Unauthorized global middleware') + } + + if (scenario === 'global-throw-string') { + throw 'global string' + } + + if (scenario === 'global-throw-response') { + throw Response.json({ denied: true }, { status: 403 }) + } + + return next() + }, +) + +const sleep = (ms: number) => + new Promise((resolve) => setTimeout(resolve, ms)) + +const globalTimeoutMiddleware = createMiddleware().server( + ({ next, request }) => { + const scenario = + request.headers.get('x-reconciliation-scenario') || + getCookie('reconciliation-scenario') + if (scenario !== 'global-timeout') { + return next() + } + return Promise.race([ + next(), + sleep(50).then( + () => + new Response('timeout', { + status: 504, + headers: { 'x-timeout-fallback': 'yes' }, + }), + ), + ]) + }, +) + +export const startInstance = createStart(() => ({ + requestMiddleware: [globalResponseMiddleware, globalTimeoutMiddleware], +})) diff --git a/e2e/react-start/response-reconciliation/src/styles/app.css b/e2e/react-start/response-reconciliation/src/styles/app.css new file mode 100644 index 0000000000..a38fb439a6 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/styles/app.css @@ -0,0 +1,12 @@ +html { + color-scheme: light dark; + font-family: system-ui, sans-serif; +} + +body { + margin: 0; +} + +main { + padding: 16px; +} diff --git a/e2e/react-start/response-reconciliation/tests/response-reconciliation.spec.ts b/e2e/react-start/response-reconciliation/tests/response-reconciliation.spec.ts new file mode 100644 index 0000000000..728b0782c5 --- /dev/null +++ b/e2e/react-start/response-reconciliation/tests/response-reconciliation.spec.ts @@ -0,0 +1,1038 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { APIResponse, Page, Response } from '@playwright/test' + +type TestResponse = APIResponse | Response + +function header(response: TestResponse, name: string) { + return response.headers()[name.toLowerCase()] ?? null +} + +async function setCookieValues(response: TestResponse) { + return (await Promise.resolve(response.headersArray())) + .filter((item) => item.name.toLowerCase() === 'set-cookie') + .map((item) => item.value) +} + +function expectCookie(cookies: Array, name: string, value: string) { + expect( + cookies.filter((cookie) => cookie.startsWith(`${name}=${value};`)), + ).toHaveLength(1) +} + +async function invokeServerFunction( + page: Page, + name: string, + scenario?: string, +) { + await page.goto( + scenario + ? `/server-functions?scenario=${encodeURIComponent(scenario)}` + : '/server-functions', + ) + await expect(page.getByTestId('server-functions-hydrated')).toBeAttached() + await page.evaluate((value) => { + document.cookie = value + ? `reconciliation-scenario=${value}; Path=/` + : 'reconciliation-scenario=; Max-Age=0; Path=/' + }, scenario) + const responsePromise = page.waitForResponse((response) => + response.url().includes('/_serverFn/'), + ) + await page.getByTestId(`server-function-${name}`).click() + const response = await responsePromise + await expect( + page.getByTestId(`server-function-${name}-result`), + ).not.toHaveText('pending') + return response +} + +async function invokeJsonServerFunction( + page: Page, + name: string, + scenario?: string, +) { + const response = await invokeServerFunction(page, name, scenario) + const request = response.request() + expect(request.headers()['x-tsr-serverfn']).toBe('true') + const postData = request.postData() + if (postData) { + expect(postData).not.toContain('x-reconciliation-scenario') + } + return response +} + +async function expectServerFunctionResult( + page: Page, + name: string, + result: string | RegExp, +) { + await expect(page.getByTestId(`server-function-${name}-result`)).toHaveText( + result, + ) +} + +test.describe('server routes', () => { + test('uses expected server entry mode', async ({ request }) => { + const response = await request.get('/api/base') + + if (process.env.TSS_E2E_SERVER_ENTRY) { + expect(header(response, 'x-custom-server-entry')).toBe('yes') + } else { + expect(header(response, 'x-custom-server-entry')).toBe(null) + } + }) + + test('global request middleware cookies are preserved on server routes', async ({ + request, + }) => { + const response = await request.get('/api/base', { + headers: { 'x-reconciliation-scenario': 'global-multiple-cookies' }, + }) + const cookies = await setCookieValues(response) + + expectCookie(cookies, 'global-one', '1') + expectCookie(cookies, 'global-two', '2') + }) + + test('regression #5407: global middleware setResponseHeaders and status apply before next', async ({ + request, + }) => { + const response = await request.get('/api/base', { + headers: { 'x-reconciliation-scenario': 'global-before' }, + }) + + expect(response.status()).toBe(231) + expect(response.statusText()).toBe('global-before') + expect(header(response, 'x-global-before')).toBe('yes') + expect(header(response, 'x-global-common')).toBe('before') + expect(header(response, 'x-base')).toBe('yes') + }) + + test('global middleware helper changes apply after next', async ({ + request, + }) => { + const response = await request.get('/api/base', { + headers: { 'x-reconciliation-scenario': 'global-after' }, + }) + + expect(response.status()).toBe(232) + expect(response.statusText()).toBe('global-after') + expect(header(response, 'x-global-after')).toBe('yes') + expect(header(response, 'x-global-common')).toBe('after') + expect(header(response, 'x-base')).toBe('yes') + }) + + test('route middleware helper changes apply before and after next', async ({ + request, + }) => { + const before = await request.get('/api/route-before-next') + expect(before.status()).toBe(234) + expect(before.statusText()).toBe('route-before') + expect(header(before, 'x-route-before')).toBe('yes') + expect(header(before, 'x-handler')).toBe('route-before-next') + + const after = await request.get('/api/route-after-next') + expect(after.status()).toBe(233) + expect(after.statusText()).toBe('route-after') + expect(header(after, 'x-route-after')).toBe('yes') + expect(header(after, 'x-handler')).toBe('route-after-next') + }) + + test('helper changes overlay same-boundary returned response conflicts', async ({ + request, + }) => { + const response = await request.get('/api/same-boundary-conflict') + + expect(response.status()).toBe(235) + expect(response.statusText()).toBe('same-boundary') + expect(header(response, 'x-conflict')).toBe('helper') + await expect(response.text()).resolves.toBe('conflict') + }) + + test('setResponseHeaders accepts Headers and preserves multiple cookies', async ({ + request, + }) => { + const response = await request.get('/api/bulk-headers') + const cookies = await setCookieValues(response) + + expect(header(response, 'x-bulk-one')).toBe('1') + expect(header(response, 'x-bulk-two')).toBe('2') + expect(header(response, 'x-keep')).toBe('yes') + expectCookie(cookies, 'bulk-one', '1') + expectCookie(cookies, 'bulk-two', '2') + }) + + test('remove and clear helpers can remove returned response headers', async ({ + request, + }) => { + const removed = await request.get('/api/remove-returned-header') + expect(header(removed, 'x-remove-me')).toBe(null) + expect(header(removed, 'x-keep')).toBe('yes') + + const cleared = await request.get('/api/clear-returned-headers') + expect(header(cleared, 'x-clear-one')).toBe(null) + expect(header(cleared, 'x-clear-two')).toBe(null) + }) + + test('getResponseHeader and getResponseHeaders read helper writes immediately', async ({ + request, + }) => { + const headerResponse = await request.get('/api/get-response-header-helper') + expect(header(headerResponse, 'x-read-after-set')).toBe('yes') + await expect(headerResponse.text()).resolves.toBe('yes') + + const headersResponse = await request.get( + '/api/get-response-headers-helper', + ) + expect(header(headersResponse, 'x-headers-read')).toBe('yes') + expect(header(headersResponse, 'x-headers-snapshot-write')).toBe(null) + await expect(headersResponse.text()).resolves.toBe('yes') + }) + + test('getResponseHeader sees direct current response header mutation', async ({ + request, + }) => { + const response = await request.get('/api/direct-mutation-visible') + + expect(header(response, 'x-direct-visible')).toBe('yes') + expect(header(response, 'x-direct-read')).toBe('yes') + }) + + test('response replacement carries helper deltas but not old response mutations', async ({ + request, + }) => { + const response = await request.get('/api/replace-after-direct-mutation') + + expect(response.status()).toBe(202) + expect(header(response, 'x-direct-a')).toBe(null) + expect(header(response, 'x-helper-delta')).toBe('yes') + expect(header(response, 'x-response-b')).toBe('yes') + await expect(response.text()).resolves.toBe('replacement') + }) + + test('later returned response replaces earlier response metadata', async ({ + request, + }) => { + const response = await request.get('/api/two-returned-responses') + + expect(header(response, 'x-response-a')).toBe(null) + expect(header(response, 'x-response-b')).toBe('yes') + expect(header(response, 'x-helper-after-a')).toBe('yes') + await expect(response.text()).resolves.toBe('response-b') + }) + + test('readonly responses reconcile through clone fallback', async ({ + request, + }) => { + const response = await request.get('/api/readonly-after-next') + + expect(header(response, 'x-readonly-after')).toBe('yes') + await expect(response.text()).resolves.toBe('readonly') + }) + + for (const status of [204, 205, 304]) { + test(`null-body status ${status} drops the response body`, async ({ + request, + }) => { + const response = await request.get( + `/api/null-body-status?status=${status}`, + ) + + expect(response.status()).toBe(status) + expect(header(response, 'x-null-body')).toBe('yes') + await expect(response.text()).resolves.toBe('') + }) + } + + test('out-of-range setResponseStatus keeps the returned status', async ({ + request, + }) => { + const response = await request.get( + '/api/status-contracts?scenario=invalid-status-return', + ) + + expect(response.status()).toBe(404) + expect(response.statusText()).toBe('Not Found') + await expect(response.text()).resolves.toBe('missing') + }) + + test('out-of-range setResponseStatus keeps the uncaught error status', async ({ + request, + }) => { + const response = await request.get( + '/api/status-contracts?scenario=invalid-status-throw', + ) + + expect(response.status()).toBe(500) + await expect(response.json()).resolves.toMatchObject({ + status: 500, + unhandled: true, + }) + }) + + test('a timeout fallback survives the handler it abandoned while an outer middleware awaits', async ({ + request, + }) => { + const response = await request.get('/api/status-contracts?scenario=slow', { + headers: { 'x-reconciliation-scenario': 'global-timeout' }, + }) + + expect(response.status()).toBe(504) + expect(header(response, 'x-timeout-fallback')).toBe('yes') + await expect(response.text()).resolves.toBe('timeout') + }) + + test('a helper success status does not hide an uncaught error', async ({ + request, + }) => { + const response = await request.get( + '/api/status-contracts?scenario=helper-success-crash', + ) + + expect(response.status()).toBe(500) + await expect(response.json()).resolves.toMatchObject({ + status: 500, + unhandled: true, + }) + }) + + test('errors caused by an upstream response adopt only its status', async ({ + request, + }) => { + const response = await request.get( + '/api/status-contracts?scenario=upstream-error-cause', + ) + const body = await response.body() + + expect(response.status()).toBe(502) + expect(header(response, 'x-upstream')).toBeNull() + expect(header(response, 'content-type')).toContain('application/json') + expect(header(response, 'content-encoding')).toBeNull() + const contentLength = header(response, 'content-length') + if (contentLength !== null) { + expect(Number(contentLength)).toBe(body.byteLength) + } + expect(await setCookieValues(response)).toEqual([]) + expect(JSON.parse(body.toString())).toMatchObject({ status: 502 }) + }) + + test('regression #5107: thrown errors preserve explicit response status and headers', async ({ + request, + }) => { + const response = await request.get('/api/throw-after-status') + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-error-helper')).toBe('yes') + expect(header(response, 'content-type')).toContain('application/json') + if (process.env.TSS_E2E_SERVER_ENTRY) { + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe(null) + } + await expect(response.json()).resolves.toMatchObject({ status: 401 }) + }) + + test('thrown responses preserve explicit response status and headers', async ({ + request, + }) => { + const response = await request.get('/api/throw-after-status?throw=response') + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-error-helper')).toBe('yes') + expect(header(response, 'x-thrown-response')).toBe('yes') + if (process.env.TSS_E2E_SERVER_ENTRY) { + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe(null) + } + await expect(response.text()).resolves.toBe('Unauthorized response') + }) + + test('custom server entry can opt out of automatic error responses', async ({ + request, + }) => { + test.skip(!process.env.TSS_E2E_SERVER_ENTRY, 'custom server entry only') + + const response = await request.get('/api/throw-after-status', { + headers: { 'x-custom-handle-errors': 'false' }, + }) + + expect(response.status()).toBe(555) + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe('yes') + await expect(response.text()).resolves.toBe('Unauthorized route') + }) + + test('custom server entry can recover Start error response state', async ({ + request, + }) => { + test.skip(!process.env.TSS_E2E_SERVER_ENTRY, 'custom server entry only') + + const response = await request.get('/api/throw-after-status', { + headers: { + 'x-custom-handle-errors': 'false', + 'x-custom-handle-start-error': 'true', + }, + }) + const cookies = await setCookieValues(response) + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-error-helper')).toBe('yes') + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe(null) + expectCookie(cookies, 'throw-after-status', '1') + await expect(response.json()).resolves.toMatchObject({ status: 401 }) + }) + + test('custom server entry can recover thrown response state', async ({ + request, + }) => { + test.skip(!process.env.TSS_E2E_SERVER_ENTRY, 'custom server entry only') + + const response = await request.get( + '/api/throw-after-status?throw=response', + { + headers: { + 'x-custom-handle-errors': 'false', + 'x-custom-handle-start-error': 'true', + }, + }, + ) + const cookies = await setCookieValues(response) + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-error-helper')).toBe('yes') + expect(header(response, 'x-thrown-response')).toBe('yes') + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe(null) + expectCookie(cookies, 'throw-after-status', '1') + await expect(response.text()).resolves.toBe('Unauthorized response') + }) + + test('custom server entry can opt out of SSR request middleware error responses', async ({ + request, + }) => { + test.skip(!process.env.TSS_E2E_SERVER_ENTRY, 'custom server entry only') + + const response = await request.get('/ssr', { + headers: { + 'x-custom-handle-errors': 'false', + 'x-reconciliation-scenario': 'global-throw', + }, + }) + + expect(response.status()).toBe(555) + expect(header(response, 'x-custom-server-entry')).toBe('yes') + expect(header(response, 'x-custom-entry-catch')).toBe('yes') + await expect(response.text()).resolves.toBe( + 'Unauthorized global middleware', + ) + }) + + test('regression #5464: multiple Set-Cookie headers are preserved', async ({ + request, + }) => { + const response = await request.get('/api/multiple-cookies') + const cookies = await setCookieValues(response) + + expectCookie(cookies, 'route-one', '1') + expectCookie(cookies, 'route-two', '2') + }) + + test('explicit Set-Cookie header values are preserved and replace response values', async ({ + request, + }) => { + const explicit = await request.get('/api/explicit-set-cookie-header') + const explicitCookies = await setCookieValues(explicit) + expectCookie(explicitCookies, 'explicit-one', '1') + expectCookie(explicitCookies, 'explicit-two', '2') + + const replaced = await request.get('/api/replace-explicit-set-cookie') + const replacedCookies = await setCookieValues(replaced) + expectCookie(replacedCookies, 'explicit-new', '1') + expect( + replacedCookies.some((cookie) => cookie.startsWith('explicit-old=1;')), + ).toBe(false) + }) + + test('cookies survive redirect responses', async ({ request }) => { + const response = await request.get('/api/redirect-with-cookies', { + maxRedirects: 0, + }) + const cookies = await setCookieValues(response) + + expect(response.status()).toBe(307) + expect(header(response, 'location')).toBe('/api/base') + expectCookie(cookies, 'redirect-one', '1') + expectCookie(cookies, 'redirect-two', '2') + expectCookie(cookies, 'redirect-three', '3') + }) + + test('generated errors drop framing headers that helpers set for the failed body', async ({ + request, + }) => { + const response = await request.get('/api/framing-error') + + expect(response.status()).toBe(500) + expect(header(response, 'content-encoding')).toBeNull() + expect(header(response, 'content-length')).not.toBe('2') + expect(await response.json()).toMatchObject({ + status: 500, + unhandled: true, + }) + }) + + test('HEAD keeps the body for middleware until the response leaves the pipeline', async ({ + request, + }) => { + const headers = { 'x-reconciliation-scenario': 'global-representation' } + const get = await request.get('/api/base', { headers }) + const head = await request.head('/api/base', { headers }) + + expect(head.status()).toBe(get.status()) + expect(Number(header(get, 'x-body-length'))).toBeGreaterThan(0) + expect(header(head, 'x-body-length')).toBe(header(get, 'x-body-length')) + expect(await head.body()).toHaveLength(0) + }) + + test('a response that middleware assigned is disposed when it returns another', async ({ + request, + }) => { + const id = crypto.randomUUID() + const response = await request.get(`/api/tracked-stream?id=${id}`, { + headers: { + 'x-reconciliation-scenario': 'global-assigned-transform-not-modified', + }, + }) + + expect(response.status()).toBe(304) + await expect + .poll(async () => + (await request.get(`/api/tracked-stream-status?id=${id}`)).json(), + ) + .toEqual({ cancelled: true }) + }) +}) + +test.describe('SSR document responses', () => { + test('regression #7647: middleware status and headers survive alongside route headers', async ({ + request, + }) => { + const response = await request.get('/', { + headers: { + accept: 'text/html', + 'x-reconciliation-scenario': 'issue-7647', + }, + }) + + expect(response.status()).toBe(418) + expect(header(response, 'x-middleware-header')).toBe('present') + expect(header(response, 'cache-control')).toBe('no-store') + expect(header(response, 'x-route-header')).toBe('present') + expect(header(response, 'content-type')).toContain('text/html') + // Custom-entry modes must actually reconstruct the streamed response. + expect(header(response, 'x-stream-response-rebuilt')).toBe( + process.env.TSS_E2E_SERVER_ENTRY ? 'yes' : null, + ) + const html = await response.text() + expect(html).toContain('Response Reconciliation E2E') + }) + + test('loader helper headers, status, and cookies reconcile onto document response', async ({ + request, + }) => { + const response = await request.get('/ssr') + const cookies = await setCookieValues(response) + + expect(response.status()).toBe(238) + expect(response.statusText()).toBe('ssr-loader') + expect(header(response, 'x-ssr-loader')).toBe('yes') + expect(header(response, 'content-type')).toContain('text/html') + expectCookie(cookies, 'ssr-one', '1') + expectCookie(cookies, 'ssr-two', '2') + await expect(response.text()).resolves.toContain('ssr response') + }) + + test('regression #5464: SSR document responses preserve multiple Set-Cookie headers', async ({ + request, + }) => { + const response = await request.get('/ssr', { + headers: { 'x-reconciliation-scenario': 'global-multiple-cookies' }, + }) + const cookies = await setCookieValues(response) + + expectCookie(cookies, 'global-one', '1') + expectCookie(cookies, 'global-two', '2') + expectCookie(cookies, 'ssr-one', '1') + expectCookie(cookies, 'ssr-two', '2') + }) + + test('global middleware after next reconciles onto document response', async ({ + request, + }) => { + const response = await request.get('/ssr', { + headers: { 'x-reconciliation-scenario': 'global-after' }, + }) + + expect(response.status()).toBe(232) + expect(response.statusText()).toBe('global-after') + expect(header(response, 'x-global-after')).toBe('yes') + expect(header(response, 'x-ssr-loader')).toBe('yes') + }) + + test('middleware can stream the document through a body transform', async ({ + request, + }) => { + const response = await request.get('/streamed', { + headers: { 'x-reconciliation-scenario': 'global-piped-copy' }, + }) + + expect(response.status()).toBe(200) + expect(header(response, 'x-global-piped-copy')).toBe('yes') + const html = await response.text() + expect(html).toContain('streamed after the shell') + expect(html).toContain('') + }) + + test('HEAD documents keep their body for middleware until the response leaves the pipeline', async ({ + request, + }) => { + const headers = { 'x-reconciliation-scenario': 'global-representation' } + const get = await request.get('/', { headers }) + const head = await request.head('/', { headers }) + + expect(head.status()).toBe(get.status()) + expect(Number(header(get, 'x-body-length'))).toBeGreaterThan(0) + expect(header(head, 'x-body-length')).toBe(header(get, 'x-body-length')) + expect(await head.body()).toHaveLength(0) + }) + + test('regression #8627: middleware can copy the document when Response is wrapped', async ({ + request, + }) => { + const response = await request.get('/streamed', { + headers: { + 'x-reconciliation-scenario': 'global-copy', + 'x-wrap-response': 'true', + }, + }) + + expect(response.status()).toBe(200) + expect(header(response, 'x-global-copy')).toBe('yes') + const html = await response.text() + expect(html).toContain('streamed after the shell') + expect(html).toContain('') + }) + + test('regression #8627: loader helpers reconcile onto the document when Response is wrapped', async ({ + request, + }) => { + const response = await request.get('/ssr', { + headers: { 'x-wrap-response': 'true' }, + }) + const cookies = await setCookieValues(response) + + expect(response.status()).toBe(238) + expect(header(response, 'x-ssr-loader')).toBe('yes') + expectCookie(cookies, 'ssr-one', '1') + const html = await response.text() + expect(html).toContain('ssr response') + expect(html).toContain('') + }) +}) + +test.describe('server functions', () => { + test('global request middleware helper changes reconcile onto serialized responses', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-before', + ) + + expect(response.status()).toBe(231) + expect(response.statusText()).toBe('global-before') + expect(header(response, 'x-global-before')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'globalSerialized', '{"ok":true}') + }) + + test('global request middleware helper changes after next reconcile onto serialized responses', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-after', + ) + + expect(response.status()).toBe(232) + expect(response.statusText()).toBe('global-after') + expect(header(response, 'x-global-after')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'globalSerialized', '{"ok":true}') + }) + + test('function middleware helper changes after next reconcile onto serialized responses', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'functionAfterNext') + + expect(response.status()).toBe(236) + expect(response.statusText()).toBe('function-after') + expect(header(response, 'x-function-after')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'functionAfterNext', '{"ok":true}') + }) + + test('raw server function responses reconcile helper changes after next', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'rawResponseAfterNext', + ) + + expect(response.status()).toBe(237) + expect(response.statusText()).toBe('function-raw-after') + expect(header(response, 'x-function-raw')).toBe('yes') + expect(header(response, 'x-function-raw-after')).toBe('yes') + expect(header(response, 'x-tss-raw')).toBe('true') + await expect(response.text()).resolves.toBe('raw function body') + await expectServerFunctionResult( + page, + 'rawResponseAfterNext', + '237:raw function body', + ) + }) + + test('function response replacement carries helper deltas only', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'replacement') + + expect(header(response, 'x-function-a')).toBe(null) + expect(header(response, 'x-function-b')).toBe('yes') + expect(header(response, 'x-function-helper-delta')).toBe('yes') + await expect(response.text()).resolves.toBe('function-b') + await expectServerFunctionResult(page, 'replacement', '200:function-b') + }) + + test('server function preserves multiple Set-Cookie headers', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'multipleCookies') + const cookies = await setCookieValues(response) + + expectCookie(cookies, 'fn-one', '1') + expectCookie(cookies, 'fn-two', '2') + await expectServerFunctionResult(page, 'multipleCookies', '{"ok":true}') + }) + + test('raw server function responses preserve multiple Set-Cookie headers', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'rawMultipleCookies') + const cookies = await setCookieValues(response) + + expect(header(response, 'x-tss-raw')).toBe('true') + expectCookie(cookies, 'fn-raw-returned-one', '1') + expectCookie(cookies, 'fn-raw-returned-two', '2') + expectCookie(cookies, 'fn-raw-helper-one', '1') + expectCookie(cookies, 'fn-raw-helper-two', '2') + await expect(response.text()).resolves.toBe('raw cookie body') + await expectServerFunctionResult( + page, + 'rawMultipleCookies', + '200:raw cookie body', + ) + }) + + test('server function explicit Set-Cookie header arrays are preserved', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'explicitCookieHeader', + ) + const cookies = await setCookieValues(response) + + expectCookie(cookies, 'fn-explicit-one', '1') + expectCookie(cookies, 'fn-explicit-two', '2') + await expectServerFunctionResult( + page, + 'explicitCookieHeader', + '{"ok":true}', + ) + }) + + test.describe('expected error responses', () => { + test.use({ + // A second RegExp would make Playwright read the array as a fixture + // tuple, so all expected statuses share one pattern. + whitelistErrors: [ + /Failed to load resource: the server responded with a status of (401 \(Unauthorized\)|403 \([^)]*\)|418 \([^)]*\)|500 \([^)]*\)|502 \([^)]*\))/, + ], + }) + + test('a server function that throws a Response rejects with it on the client', async ({ + page, + }) => { + const response = await invokeServerFunction(page, 'throwResponse') + + expect(response.status()).toBe(418) + expect(header(response, 'x-tss-raw')).toBe('thrown') + await expectServerFunctionResult( + page, + 'throwResponse', + 'thrown 418:teapot', + ) + }) + + test('server function thrown errors preserve explicit response status', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'throwAfterStatus') + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-function-error')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'throwAfterStatus', /Unauthorized/) + }) + + test('server function errors drop framing headers that helpers set for the failed body', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'throwAfterFraming') + + expect(header(response, 'content-encoding')).toBeNull() + expect(header(response, 'content-length')).not.toBe('2') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult( + page, + 'throwAfterFraming', + 'File read failed', + ) + }) + + test('server function request middleware errors caused by an upstream response adopt only its status', async ({ + page, + context, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-upstream-cause', + ) + + expect(response.status()).toBe(502) + expect(header(response, 'x-upstream')).toBeNull() + expect(header(response, 'content-type')).toContain('application/json') + expect(header(response, 'content-encoding')).toBeNull() + expect(await setCookieValues(response)).toEqual([]) + expect(await context.cookies()).not.toEqual( + expect.arrayContaining([ + expect.objectContaining({ name: 'upstream-session' }), + ]), + ) + await expectServerFunctionResult( + page, + 'globalSerialized', + 'Upstream failed', + ) + }) + + test('serialized errors drop a Location from error metadata', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-location-error', + ) + + // Error metadata below 400 falls back to 500, and Location is dropped. + expect(response.status()).toBe(500) + expect(header(response, 'location')).toBeNull() + expect(response.request().redirectedTo()).toBeNull() + await expectServerFunctionResult(page, 'globalSerialized', 'Moved error') + }) + + test('server function request middleware errors are serialized', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-throw', + ) + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-global-error')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'globalSerialized', /Unauthorized/) + }) + + test('a string thrown by request middleware rejects the server function call with it', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-throw-string', + ) + + expect(response.status()).toBe(500) + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult( + page, + 'globalSerialized', + 'thrown:"global string"', + ) + }) + + test('a Response thrown by request middleware rejects the server function call with it', async ({ + page, + }) => { + const response = await invokeServerFunction( + page, + 'globalSerialized', + 'global-throw-response', + ) + + expect(response.status()).toBe(403) + expect(header(response, 'x-tss-raw')).toBe('thrown') + await expectServerFunctionResult( + page, + 'globalSerialized', + 'thrown 403:{"denied":true}', + ) + }) + + test('regression #5107: function middleware thrown errors preserve explicit response status', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'throwAfterMiddlewareStatus', + ) + + expect(response.status()).toBe(401) + expect(response.statusText()).toBe('Unauthorized') + expect(header(response, 'x-function-error-middleware')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult( + page, + 'throwAfterMiddlewareStatus', + /Unauthorized/, + ) + }) + }) + + test('a server function that throws 0 rejects on the client', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'throwZero') + + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'throwZero', 'thrown:0') + }) + + test('serialized server function replies keep their body when a helper selects 204', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'bodylessStatus') + + expect(response.status()).toBe(200) + expect(header(response, 'x-bodyless-status')).toBe('ignored') + expect(header(response, 'x-tss-serialized')).toBe('true') + await expectServerFunctionResult(page, 'bodylessStatus', '{"ok":true}') + }) + + test('serialized replies drop a helper Location so fetch does not follow it', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'helperLocation') + + expect(response.status()).toBe(302) + expect(header(response, 'location')).toBeNull() + expect(response.request().redirectedTo()).toBeNull() + await expectServerFunctionResult(page, 'helperLocation', '{"ok":true}') + }) + + test('same-body wrapper responses keep serialized transport headers', async ({ + page, + }) => { + const response = await invokeJsonServerFunction( + page, + 'globalSerialized', + 'global-same-body-wrapper', + ) + + expect(header(response, 'x-same-body-wrapper')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + expect(header(response, 'content-type')).toContain('application/json') + await expectServerFunctionResult(page, 'globalSerialized', '{"ok":true}') + }) + + test('transport headers win over user helpers while user headers persist', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'transportProtected') + + expect(header(response, 'x-user-header')).toBe('yes') + expect(header(response, 'x-tss-serialized')).toBe('true') + expect(header(response, 'content-type')).toContain('application/json') + await expectServerFunctionResult(page, 'transportProtected', '{"ok":true}') + }) + + for (const name of ['returnRedirect', 'throwRedirect']) { + test(`server function ${name} navigates through the client with helper status and headers`, async ({ + page, + context, + }) => { + await page.goto('/server-functions') + await expect(page.getByTestId('server-functions-hydrated')).toBeAttached() + const responsePromise = page.waitForResponse((response) => + response.url().includes('/_serverFn/'), + ) + await page.getByTestId(`server-function-${name}`).click() + const response = await responsePromise + + expect(response.status()).toBe(302) + expect(header(response, 'location')).toBeNull() + expect(header(response, 'content-type')).toContain('application/json') + expect(header(response, 'x-tss-raw')).toBeNull() + expect(header(response, 'x-tss-serialized')).toBeNull() + expect(response.request().redirectedTo()).toBeNull() + // Playwright cannot expose a 302 body, even without Location. Successful + // client navigation verifies that Start decoded the redirect envelope. + await expect(page).toHaveURL('/') + await expect( + page.getByRole('heading', { name: 'Response Reconciliation E2E' }), + ).toBeVisible() + expect(await context.cookies()).toEqual( + expect.arrayContaining([ + expect.objectContaining({ name: 'rpc-redirect', value: 'committed' }), + ]), + ) + }) + } + + test('server function getResponseHeader sees helper writes immediately', async ({ + page, + }) => { + const response = await invokeJsonServerFunction(page, 'readAfterSet') + + expect(header(response, 'x-read-after-set')).toBe('yes') + expect(header(response, 'x-read-after-set-value')).toBe('yes') + await expectServerFunctionResult(page, 'readAfterSet', '{"ok":true}') + }) +}) diff --git a/e2e/react-start/response-reconciliation/tsconfig.json b/e2e/react-start/response-reconciliation/tsconfig.json new file mode 100644 index 0000000000..3824b148e1 --- /dev/null +++ b/e2e/react-start/response-reconciliation/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx", "public/script*.js"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/react-start/response-reconciliation/vite.config.ts b/e2e/react-start/response-reconciliation/vite.config.ts new file mode 100644 index 0000000000..355e12a2f7 --- /dev/null +++ b/e2e/react-start/response-reconciliation/vite.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' + +const serverEntry = process.env.TSS_E2E_SERVER_ENTRY +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + plugins: [ + tanstackStart({ + server: serverEntry ? { entry: serverEntry } : undefined, + }), + viteReact(), + ], +}) diff --git a/e2e/react-start/root-document-hydration/package.json b/e2e/react-start/root-document-hydration/package.json index 73aab62031..9dcfcb6fbc 100644 --- a/e2e/react-start/root-document-hydration/package.json +++ b/e2e/react-start/root-document-hydration/package.json @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/rsbuild/package.json b/e2e/react-start/rsbuild/package.json index 8711d7a737..d03ef22542 100644 --- a/e2e/react-start/rsbuild/package.json +++ b/e2e/react-start/rsbuild/package.json @@ -28,13 +28,13 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^0.10.0", + "srvx": "^1.0.0", "typescript": "^5.7.2" } } diff --git a/e2e/react-start/rsc-deferred-hydration/package.json b/e2e/react-start/rsc-deferred-hydration/package.json index 63036900c4..06317e59d0 100644 --- a/e2e/react-start/rsc-deferred-hydration/package.json +++ b/e2e/react-start/rsc-deferred-hydration/package.json @@ -45,8 +45,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.30", - "srvx": "^0.11.9", + "@vitejs/plugin-rsc": "^0.5.39", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/rsc-query/package.json b/e2e/react-start/rsc-query/package.json index 48a7fcae1d..68a99cd432 100644 --- a/e2e/react-start/rsc-query/package.json +++ b/e2e/react-start/rsc-query/package.json @@ -28,8 +28,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.30", - "srvx": "^0.10.0", + "@vitejs/plugin-rsc": "^0.5.39", + "srvx": "^1.0.0", "typescript": "^5.7.2", "vite": "^8.0.14" } diff --git a/e2e/react-start/rsc-rsbuild/package.json b/e2e/react-start/rsc-rsbuild/package.json index 340d75b006..067394fc08 100644 --- a/e2e/react-start/rsc-rsbuild/package.json +++ b/e2e/react-start/rsc-rsbuild/package.json @@ -28,13 +28,13 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^0.10.0", + "srvx": "^1.0.0", "typescript": "^5.7.2" } } diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json index 4080fa83dc..a30227d509 100644 --- a/e2e/react-start/rsc/package.json +++ b/e2e/react-start/rsc/package.json @@ -13,7 +13,8 @@ "build:vite": "vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e-full": "pnpm build && playwright test --project=chromium" + "test:e2e-full": "pnpm build && playwright test --project=chromium", + "test:e2e:dev:rsbuild": "MODE=dev E2E_TOOLCHAIN=rsbuild playwright test --project=chromium" }, "nx": { "metadata": { @@ -40,7 +41,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/eslint-plugin-start": "workspace:^", "@tanstack/router-e2e-utils": "workspace:^", @@ -49,9 +50,9 @@ "@types/react-dom": "^19.0.3", "@typescript-eslint/parser": "^8.23.0", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.30", + "@vitejs/plugin-rsc": "^0.5.39", "eslint": "^9.22.0", - "srvx": "^0.10.0", + "srvx": "^1.0.0", "typescript": "^5.7.2", "vite": "^8.0.14" } diff --git a/e2e/react-start/rsc/playwright.config.ts b/e2e/react-start/rsc/playwright.config.ts index 6cbc07f75a..075efdc5b9 100644 --- a/e2e/react-start/rsc/playwright.config.ts +++ b/e2e/react-start/rsc/playwright.config.ts @@ -2,6 +2,8 @@ import { defineConfig, devices } from '@playwright/test' import { appServerReady } from '@tanstack/router-e2e-utils' const distDir = process.env.E2E_DIST_DIR ?? 'dist' +// MODE=dev runs the suite against the Rsbuild dev server instead of a build +const isRsbuildDev = process.env.MODE === 'dev' const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` @@ -16,7 +18,7 @@ export default defineConfig({ }, webServer: { - command: 'pnpm start', + command: isRsbuildDev ? 'pnpm dev:rsbuild --port 0' : 'pnpm start', wait: appServerReady, reuseExistingServer: false, stdout: 'pipe', diff --git a/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts b/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts index f5d8e04928..35db86eca9 100644 --- a/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts @@ -116,15 +116,16 @@ test.describe('RSC Complex CSS Preload Tests', () => { test('CSS module classes are scoped for all widgets', async ({ page }) => { await page.goto('/rsc-css-preload-complex') - // Widget A classes should be hashed (accept Vite `_widget_xxx` or Rspack `widget-xxx` scoped names) + // Widget A classes should be hashed (accept Vite `_widget_xxx`, Rspack + // `widget-xxx`, and Rsbuild dev `src-...-module__widget-xxx` scoped names) const widgetA = page.locator('[data-testid="client-widget-a"]') const widgetAClass = await widgetA.getAttribute('class') - expect(widgetAClass).toMatch(/(^|\s)(_widget_|widget[-_])[\w-]+/) + expect(widgetAClass).toMatch(/(^|\s|__)(_widget_|widget[-_])[\w-]+/) // Widget B classes should be hashed const widgetB = page.locator('[data-testid="client-widget-b"]') const widgetBClass = await widgetB.getAttribute('class') - expect(widgetBClass).toMatch(/(^|\s)(_widget_|widget[-_])[\w-]+/) + expect(widgetBClass).toMatch(/(^|\s|__)(_widget_|widget[-_])[\w-]+/) // Classes should be different (different modules) expect(widgetAClass).not.toBe(widgetBClass) diff --git a/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts b/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts index 5faa6b1508..842c9358c0 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts @@ -67,29 +67,22 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', // Start streaming await page.getByTestId('start-stream-btn').click() - // First 3 should appear quickly (initial batch) - await expect(page.getByTestId('notification-list')).toBeVisible() - - // Wait a bit and check that notifications are accumulating - await page.waitForTimeout(500) - const initialCount = await page + const notifications = page .getByTestId('notification-list') .locator('[data-testid^="notification-notif_"]') - .count() - expect(initialCount).toBeGreaterThanOrEqual(3) - // Wait for more to stream in - await page.waitForTimeout(2000) - const laterCount = await page - .getByTestId('notification-list') - .locator('[data-testid^="notification-notif_"]') - .count() - expect(laterCount).toBeGreaterThan(initialCount) + // The initial batch of 3 renders while the stream is still open + await expect(notifications.nth(2)).toBeVisible() + await expect(page.getByTestId('streaming-status')).toBeVisible() + const initialCount = await notifications.count() + expect(initialCount).toBeLessThan(7) - // Wait for completion + // The remaining notifications stream in afterwards + await expect(notifications.nth(initialCount)).toBeVisible() await expect(page.getByTestId('stream-complete')).toBeVisible({ timeout: 10000, }) + await expect(notifications).toHaveCount(7) }) test('Each notification is a complete RSC with server data', async ({ diff --git a/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts b/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts index 356907e311..dc21f8d9c5 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts @@ -67,29 +67,22 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( // Start streaming await page.getByTestId('start-stream-btn').click() - // First 3 should appear quickly (initial batch) - await expect(page.getByTestId('notification-list')).toBeVisible() - - // Wait a bit and check that notifications are accumulating - await page.waitForTimeout(500) - const initialCount = await page + const notifications = page .getByTestId('notification-list') .locator('[data-testid^="notification-notif_"]') - .count() - expect(initialCount).toBeGreaterThanOrEqual(3) - // Wait for more to stream in - await page.waitForTimeout(2000) - const laterCount = await page - .getByTestId('notification-list') - .locator('[data-testid^="notification-notif_"]') - .count() - expect(laterCount).toBeGreaterThan(initialCount) + // The initial batch of 3 renders while the stream is still open + await expect(notifications.nth(2)).toBeVisible() + await expect(page.getByTestId('streaming-status')).toBeVisible() + const initialCount = await notifications.count() + expect(initialCount).toBeLessThan(7) - // Wait for completion + // The remaining notifications stream in afterwards + await expect(notifications.nth(initialCount)).toBeVisible() await expect(page.getByTestId('stream-complete')).toBeVisible({ timeout: 10000, }) + await expect(notifications).toHaveCount(7) }) test('Each notification is a complete RSC with server data', async ({ diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json index cd7c39ac39..9e90871158 100644 --- a/e2e/react-start/scroll-restoration/package.json +++ b/e2e/react-start/scroll-restoration/package.json @@ -30,7 +30,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/selective-ssr/package.json b/e2e/react-start/selective-ssr/package.json index 110fb50dce..87e8e3cf42 100644 --- a/e2e/react-start/selective-ssr/package.json +++ b/e2e/react-start/selective-ssr/package.json @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/serialization-adapters/package.json b/e2e/react-start/serialization-adapters/package.json index b3596cd033..5bf4b29a80 100644 --- a/e2e/react-start/serialization-adapters/package.json +++ b/e2e/react-start/serialization-adapters/package.json @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/server-functions-global-middleware/package.json b/e2e/react-start/server-functions-global-middleware/package.json index d2949965bb..4aab99e22c 100644 --- a/e2e/react-start/server-functions-global-middleware/package.json +++ b/e2e/react-start/server-functions-global-middleware/package.json @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/server-functions-global-middleware/src/routeTree.gen.ts b/e2e/react-start/server-functions-global-middleware/src/routeTree.gen.ts index 739df05d7a..e909a808f2 100644 --- a/e2e/react-start/server-functions-global-middleware/src/routeTree.gen.ts +++ b/e2e/react-start/server-functions-global-middleware/src/routeTree.gen.ts @@ -13,6 +13,7 @@ import { Route as IndexRouteImport } from './routes/index' import { Route as ContextCollisionRouteImport } from './routes/context-collision' import { Route as MultipleServerFunctionsRouteImport } from './routes/multiple-server-functions' import { Route as PathnameMiddlewareRouteImport } from './routes/pathname-middleware' +import { Route as SendContextContractRouteImport } from './routes/send-context-contract' import { Route as SimpleRouteImport } from './routes/simple' const IndexRoute = IndexRouteImport.update({ @@ -35,6 +36,11 @@ const PathnameMiddlewareRoute = PathnameMiddlewareRouteImport.update({ path: '/pathname-middleware', getParentRoute: () => rootRouteImport, } as any) +const SendContextContractRoute = SendContextContractRouteImport.update({ + id: '/send-context-contract', + path: '/send-context-contract', + getParentRoute: () => rootRouteImport, +} as any) const SimpleRoute = SimpleRouteImport.update({ id: '/simple', path: '/simple', @@ -46,6 +52,7 @@ export interface FileRoutesByFullPath { '/context-collision': typeof ContextCollisionRoute '/multiple-server-functions': typeof MultipleServerFunctionsRoute '/pathname-middleware': typeof PathnameMiddlewareRoute + '/send-context-contract': typeof SendContextContractRoute '/simple': typeof SimpleRoute } export interface FileRoutesByTo { @@ -53,6 +60,7 @@ export interface FileRoutesByTo { '/context-collision': typeof ContextCollisionRoute '/multiple-server-functions': typeof MultipleServerFunctionsRoute '/pathname-middleware': typeof PathnameMiddlewareRoute + '/send-context-contract': typeof SendContextContractRoute '/simple': typeof SimpleRoute } export interface FileRoutesById { @@ -61,6 +69,7 @@ export interface FileRoutesById { '/context-collision': typeof ContextCollisionRoute '/multiple-server-functions': typeof MultipleServerFunctionsRoute '/pathname-middleware': typeof PathnameMiddlewareRoute + '/send-context-contract': typeof SendContextContractRoute '/simple': typeof SimpleRoute } export interface FileRouteTypes { @@ -70,6 +79,7 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' + | '/send-context-contract' | '/simple' fileRoutesByTo: FileRoutesByTo to: @@ -77,6 +87,7 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' + | '/send-context-contract' | '/simple' id: | '__root__' @@ -84,6 +95,7 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' + | '/send-context-contract' | '/simple' fileRoutesById: FileRoutesById } @@ -92,6 +104,7 @@ export interface RootRouteChildren { ContextCollisionRoute: typeof ContextCollisionRoute MultipleServerFunctionsRoute: typeof MultipleServerFunctionsRoute PathnameMiddlewareRoute: typeof PathnameMiddlewareRoute + SendContextContractRoute: typeof SendContextContractRoute SimpleRoute: typeof SimpleRoute } @@ -125,6 +138,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof PathnameMiddlewareRouteImport parentRoute: typeof rootRouteImport } + '/send-context-contract': { + id: '/send-context-contract' + path: '/send-context-contract' + fullPath: '/send-context-contract' + preLoaderRoute: typeof SendContextContractRouteImport + parentRoute: typeof rootRouteImport + } '/simple': { id: '/simple' path: '/simple' @@ -140,6 +160,7 @@ const rootRouteChildren: RootRouteChildren = { ContextCollisionRoute: ContextCollisionRoute, MultipleServerFunctionsRoute: MultipleServerFunctionsRoute, PathnameMiddlewareRoute: PathnameMiddlewareRoute, + SendContextContractRoute: SendContextContractRoute, SimpleRoute: SimpleRoute, } export const routeTree = rootRouteImport diff --git a/e2e/react-start/server-functions-global-middleware/src/routes/send-context-contract.tsx b/e2e/react-start/server-functions-global-middleware/src/routes/send-context-contract.tsx new file mode 100644 index 0000000000..af4a22b6fd --- /dev/null +++ b/e2e/react-start/server-functions-global-middleware/src/routes/send-context-contract.tsx @@ -0,0 +1,181 @@ +import { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { createMiddleware, createServerFn } from '@tanstack/react-start' + +function verifyCopy( + source: object, + actual: unknown, + expected: Record, +) { + if ( + actual === source || + JSON.stringify(actual) !== JSON.stringify(expected) + ) { + throw new Error('sendContext must merge into a fresh object') + } +} + +const absent = createMiddleware({ type: 'function' }) + .client(async ({ sendContext, next }) => { + if (sendContext !== undefined) { + throw new Error('Absent client sendContext must be undefined') + } + const result = await next() + if (result.sendContext !== undefined) { + throw new Error('Absent client result sendContext must be undefined') + } + return result + }) + .server(async ({ next }) => { + const result = await next() + if (result.sendContext !== undefined) { + throw new Error('Absent server result sendContext must be undefined') + } + return result + }) + +const explicitEmpty = createMiddleware({ type: 'function' }) + .client(async ({ next }) => { + const source = Object.freeze({}) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, {}) + return result + }) + .server(async ({ next }) => { + const source = Object.freeze({}) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, {}) + return result + }) + +const first = createMiddleware({ type: 'function' }) + .client(async ({ next }) => { + const source = Object.freeze({ first: 'one' }) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, { first: 'one', second: 'two' }) + return result + }) + .server(async ({ next }) => { + const source = Object.freeze({ first: 'one' }) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, { first: 'one', second: 'two' }) + return result + }) + +const second = createMiddleware({ type: 'function' }) + .middleware([first]) + .client(async ({ next }) => { + const source = Object.freeze({ second: 'two' }) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, { first: 'one', second: 'two' }) + return result + }) + .server(async ({ context, next }) => { + if (context.first !== 'one' || context.second !== 'two') { + throw new Error('Client sendContext must reach the server') + } + const source = Object.freeze({ second: 'two' }) + const result = await next({ sendContext: source }) + verifyCopy(source, result.sendContext, { first: 'one', second: 'two' }) + return result + }) + +const absentFn = createServerFn() + .middleware([absent]) + .handler(() => 'absent') + +const emptyFn = createServerFn() + .middleware([explicitEmpty]) + .handler(() => 'empty') + +const nonemptyFn = createServerFn() + .middleware([second]) + .handler(() => 'nonempty') + +const accessors = createMiddleware({ type: 'function' }) + .client(async ({ next }) => { + const source = Object.freeze({ value: 'client' }) + const reads: Array = [] + const result = await next({ + get sendContext() { + reads.push('sendContext') + return source + }, + get headers() { + reads.push('headers') + return { 'x-context-accessor': 'preserved' } + }, + }) + if (reads.join(',') !== 'sendContext,headers,sendContext,headers') { + throw new Error(`Client middleware accessor order changed: ${reads}`) + } + verifyCopy(source, result.sendContext, { value: 'client' }) + if (new Headers(result.headers).get('x-context-accessor') !== 'preserved') { + throw new Error('Client middleware header was not preserved') + } + return result + }) + .server(async ({ next }) => { + const source = Object.freeze({ value: 'server' }) + let reads = 0 + const result = await next({ + get sendContext() { + reads++ + return source + }, + }) + if (reads !== 2) { + throw new Error(`Server middleware accessor read ${reads} times`) + } + verifyCopy(source, result.sendContext, { value: 'server' }) + return result + }) + +const observeServerReply = createMiddleware({ type: 'function' }) + .middleware([accessors]) + .client(async ({ next }) => { + const result = await next() + if (result.context.value !== 'server') { + throw new Error('Server sendContext must reach the client result context') + } + return result + }) + +const accessorFn = createServerFn() + .middleware([observeServerReply]) + .handler(() => 'accessors') + +async function verifyAll() { + return ( + await Promise.all([absentFn(), emptyFn(), nonemptyFn(), accessorFn()]) + ).join(',') +} + +export const Route = createFileRoute('/send-context-contract')({ + loader: verifyAll, + component: SendContextContract, +}) + +function SendContextContract() { + const loaderResult = Route.useLoaderData() + const [result, setResult] = useState('pending') + return ( +
+
{loaderResult}
+ +
{result}
+
+ ) +} diff --git a/e2e/react-start/server-functions-global-middleware/tests/send-context-contract.spec.ts b/e2e/react-start/server-functions-global-middleware/tests/send-context-contract.spec.ts new file mode 100644 index 0000000000..e39927ebab --- /dev/null +++ b/e2e/react-start/server-functions-global-middleware/tests/send-context-contract.spec.ts @@ -0,0 +1,15 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' + +test('preserves absent and explicit sendContext through SSR and client calls', async ({ + page, +}) => { + await page.goto('/send-context-contract') + await expect(page.getByTestId('send-context-loader')).toHaveText( + 'absent,empty,nonempty,accessors', + ) + await page.getByTestId('invoke-send-context-contract').click() + await expect(page.getByTestId('send-context-client')).toHaveText( + 'absent,empty,nonempty,accessors', + ) +}) diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json index 60e6aa1706..63d8661717 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", @@ -42,7 +42,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/server-routes-global-middleware/package.json b/e2e/react-start/server-routes-global-middleware/package.json index f835d043e8..ea6ddfb793 100644 --- a/e2e/react-start/server-routes-global-middleware/package.json +++ b/e2e/react-start/server-routes-global-middleware/package.json @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json index 0e09246ad8..99e9090a16 100644 --- a/e2e/react-start/server-routes/package.json +++ b/e2e/react-start/server-routes/package.json @@ -34,7 +34,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/session-handling/.gitignore b/e2e/react-start/session-handling/.gitignore new file mode 100644 index 0000000000..16187ac1de --- /dev/null +++ b/e2e/react-start/session-handling/.gitignore @@ -0,0 +1,24 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.tanstack +.env +.vercel +.output +/build/ +/api/ +/server/build +/public/build + +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ +/dist/ +/dist-*/ +/port-*.txt diff --git a/e2e/react-start/session-handling/.prettierignore b/e2e/react-start/session-handling/.prettierignore new file mode 100644 index 0000000000..40a96e8819 --- /dev/null +++ b/e2e/react-start/session-handling/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts diff --git a/e2e/react-start/session-handling/package.json b/e2e/react-start/session-handling/package.json new file mode 100644 index 0000000000..9dda8b2843 --- /dev/null +++ b/e2e/react-start/session-handling/package.json @@ -0,0 +1,66 @@ +{ + "name": "tanstack-react-start-e2e-session-handling", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "pnpm dev:vite --port 3000", + "dev:e2e": "pnpm dev:vite", + "dev:vite": "vite dev", + "dev:rsbuild": "rsbuild dev", + "build": "pnpm build:vite", + "build:vite": "vite build && tsc --noEmit", + "build:rsbuild": "rsbuild build && tsc --noEmit", + "preview": "vite preview", + "start": "node server.js", + "test:e2e:local": "pnpm build && playwright test --project=chromium" + }, + "dependencies": { + "@hono/session": "0.2.1", + "@tanstack/react-router": "workspace:*", + "@tanstack/react-start": "workspace:*", + "hono": "4.13.9", + "hono-sessions": "0.8.1", + "iron-session": "9.0.1", + "react": "^19.2.3", + "react-dom": "^19.2.3" + }, + "devDependencies": { + "@playwright/test": "^1.57.0", + "@rsbuild/core": "^2.3.1", + "@rsbuild/plugin-react": "^2.0.0", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "25.0.9", + "@types/react": "^19.2.8", + "@types/react-dom": "^19.2.3", + "@vitejs/plugin-react": "^6.0.1", + "srvx": "^1.0.0", + "typescript": "^6.0.2", + "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "parallelism": false + }, + "test:e2e--vite-ssr": { + "parallelism": false + }, + "test:e2e--rsbuild-ssr": { + "parallelism": false + } + }, + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } + } +} diff --git a/e2e/react-start/session-handling/playwright.config.ts b/e2e/react-start/session-handling/playwright.config.ts new file mode 100644 index 0000000000..707af45de6 --- /dev/null +++ b/e2e/react-start/session-handling/playwright.config.ts @@ -0,0 +1,35 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { + baseURL, + }, + webServer: { + command: `pnpm start`, + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + env: { + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_TOOLCHAIN: toolchain, + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/session-handling/rsbuild.config.ts b/e2e/react-start/session-handling/rsbuild.config.ts new file mode 100644 index 0000000000..af8c3df7d2 --- /dev/null +++ b/e2e/react-start/session-handling/rsbuild.config.ts @@ -0,0 +1,14 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + plugins: [pluginReact(), tanstackStart()], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/session-handling/server.js b/e2e/react-start/session-handling/server.js new file mode 100644 index 0000000000..da874e85c7 --- /dev/null +++ b/e2e/react-start/session-handling/server.js @@ -0,0 +1,51 @@ +import fs from 'node:fs' +import path from 'node:path' +import { spawn } from 'node:child_process' +import { pathToFileURL } from 'node:url' + +const distDir = process.env.E2E_DIST_DIR || 'dist' + +function resolveDistClientDir() { + return path.resolve(distDir, 'client') +} + +function resolveDistServerEntryPath() { + const serverJsPath = path.resolve(distDir, 'server', 'server.js') + if (fs.existsSync(serverJsPath)) { + return serverJsPath + } + + const indexJsPath = path.resolve(distDir, 'server', 'index.js') + if (fs.existsSync(indexJsPath)) { + return indexJsPath + } + + return serverJsPath +} + +export function start() { + const child = spawn( + 'srvx', + ['--prod', '-s', resolveDistClientDir(), resolveDistServerEntryPath()], + { + stdio: 'inherit', + shell: process.platform === 'win32', + }, + ) + + child.on('exit', (code, signal) => { + if (signal) { + process.kill(process.pid, signal) + return + } + + process.exit(code ?? 0) + }) +} + +if ( + process.argv[1] && + import.meta.url === pathToFileURL(process.argv[1]).href +) { + start() +} diff --git a/e2e/react-start/session-handling/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/session-handling/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..f3d691814f --- /dev/null +++ b/e2e/react-start/session-handling/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,20 @@ +import { ErrorComponent, Link, useRouter } from '@tanstack/react-router' +import type { ErrorComponentProps } from '@tanstack/react-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + + return ( +
+ + + Home +
+ ) +} diff --git a/e2e/react-start/session-handling/src/components/NotFound.tsx b/e2e/react-start/session-handling/src/components/NotFound.tsx new file mode 100644 index 0000000000..0b720f0e37 --- /dev/null +++ b/e2e/react-start/session-handling/src/components/NotFound.tsx @@ -0,0 +1,10 @@ +import { Link } from '@tanstack/react-router' + +export function NotFound({ children }: { children?: React.ReactNode }) { + return ( +
+ {children ||

The page you are looking for does not exist.

} + Start Over +
+ ) +} diff --git a/e2e/react-start/session-handling/src/hono-sessions.ts b/e2e/react-start/session-handling/src/hono-sessions.ts new file mode 100644 index 0000000000..63703a487b --- /dev/null +++ b/e2e/react-start/session-handling/src/hono-sessions.ts @@ -0,0 +1,68 @@ +import { useSession as useHonoSession } from '@hono/session' +import { Hono } from 'hono' +import { setCookie } from 'hono/cookie' +import { CookieStore, sessionMiddleware } from 'hono-sessions' +import { sessionPassword } from './session' +import type { SessionEnv } from '@hono/session' +import type { Session } from 'hono-sessions' + +// These are genuine Hono applications. Start forwards the original Fetch +// Request and returns the Response after Hono has finished its middleware. +export const honoSessionApp = new Hono>() + .use( + '*', + useHonoSession({ + secret: new TextEncoder().encode('0123456789abcdef0123456789abcdef'), + duration: { absolute: 3600 }, + }), + ) + .get('/api/session-hono', async (c) => + c.json({ data: (await c.var.session.get()) ?? {} }), + ) + .post('/api/session-hono', async (c) => { + const data = await c.req.json<{ user: string }>() + await c.var.session.update({ user: data.user }) + setCookie(c, 'hono-extra', '1', { + path: '/', + expires: new Date(Date.now() + 24 * 60 * 60 * 1000), + }) + return c.json({ data: c.var.session.data }) + }) + .delete('/api/session-hono', (c) => { + c.var.session.delete() + return c.json({ cleared: true }) + }) + +export const communitySessionApp = new Hono<{ + Variables: { + session: Session<{ user: string }> + session_key_rotation: boolean + } +}>() + .use( + '*', + sessionMiddleware({ + store: new CookieStore(), + encryptionKey: sessionPassword, + expireAfterSeconds: 3600, + sessionCookieName: 'hono-community', + cookieOptions: { + path: '/', + httpOnly: true, + sameSite: 'Lax', + secure: false, + }, + }), + ) + .get('/api/session-hono-community', (c) => + c.json({ data: { user: c.var.session.get('user') } }), + ) + .post('/api/session-hono-community', async (c) => { + const data = await c.req.json<{ user: string }>() + c.var.session.set('user', data.user) + return c.json({ data: { user: c.var.session.get('user') } }) + }) + .delete('/api/session-hono-community', (c) => { + c.var.session.deleteSession() + return c.json({ cleared: true }) + }) diff --git a/e2e/react-start/session-handling/src/routeTree.gen.ts b/e2e/react-start/session-handling/src/routeTree.gen.ts new file mode 100644 index 0000000000..5ecad97ab4 --- /dev/null +++ b/e2e/react-start/session-handling/src/routeTree.gen.ts @@ -0,0 +1,346 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ServerFunctionsRouteImport } from './routes/server-functions' +import { Route as SsrRouteImport } from './routes/ssr' +import { Route as ApiSessionRouteImport } from './routes/api/session' +import { Route as ApiSessionClearRouteImport } from './routes/api/session-clear' +import { Route as ApiSessionFlashRouteImport } from './routes/api/session-flash' +import { Route as ApiSessionHelperCookieRouteImport } from './routes/api/session-helper-cookie' +import { Route as ApiSessionHonoRouteImport } from './routes/api/session-hono' +import { Route as ApiSessionHonoCommunityRouteImport } from './routes/api/session-hono-community' +import { Route as ApiSessionHonoCookieRouteImport } from './routes/api/session-hono-cookie' +import { Route as ApiSessionIronRouteImport } from './routes/api/session-iron' +import { Route as ApiSessionMiddlewareRouteImport } from './routes/api/session-middleware' +import { Route as ApiSessionNamedRouteImport } from './routes/api/session-named' +import { Route as ApiSessionRedirectRouteImport } from './routes/api/session-redirect' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const ServerFunctionsRoute = ServerFunctionsRouteImport.update({ + id: '/server-functions', + path: '/server-functions', + getParentRoute: () => rootRouteImport, +} as any) +const SsrRoute = SsrRouteImport.update({ + id: '/ssr', + path: '/ssr', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionRoute = ApiSessionRouteImport.update({ + id: '/api/session', + path: '/api/session', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionClearRoute = ApiSessionClearRouteImport.update({ + id: '/api/session-clear', + path: '/api/session-clear', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionFlashRoute = ApiSessionFlashRouteImport.update({ + id: '/api/session-flash', + path: '/api/session-flash', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionHelperCookieRoute = ApiSessionHelperCookieRouteImport.update({ + id: '/api/session-helper-cookie', + path: '/api/session-helper-cookie', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionHonoRoute = ApiSessionHonoRouteImport.update({ + id: '/api/session-hono', + path: '/api/session-hono', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionHonoCommunityRoute = ApiSessionHonoCommunityRouteImport.update({ + id: '/api/session-hono-community', + path: '/api/session-hono-community', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionHonoCookieRoute = ApiSessionHonoCookieRouteImport.update({ + id: '/api/session-hono-cookie', + path: '/api/session-hono-cookie', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionIronRoute = ApiSessionIronRouteImport.update({ + id: '/api/session-iron', + path: '/api/session-iron', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionMiddlewareRoute = ApiSessionMiddlewareRouteImport.update({ + id: '/api/session-middleware', + path: '/api/session-middleware', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionNamedRoute = ApiSessionNamedRouteImport.update({ + id: '/api/session-named', + path: '/api/session-named', + getParentRoute: () => rootRouteImport, +} as any) +const ApiSessionRedirectRoute = ApiSessionRedirectRouteImport.update({ + id: '/api/session-redirect', + path: '/api/session-redirect', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/api/session': typeof ApiSessionRoute + '/api/session-clear': typeof ApiSessionClearRoute + '/api/session-flash': typeof ApiSessionFlashRoute + '/api/session-helper-cookie': typeof ApiSessionHelperCookieRoute + '/api/session-hono': typeof ApiSessionHonoRoute + '/api/session-hono-community': typeof ApiSessionHonoCommunityRoute + '/api/session-hono-cookie': typeof ApiSessionHonoCookieRoute + '/api/session-iron': typeof ApiSessionIronRoute + '/api/session-middleware': typeof ApiSessionMiddlewareRoute + '/api/session-named': typeof ApiSessionNamedRoute + '/api/session-redirect': typeof ApiSessionRedirectRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/api/session': typeof ApiSessionRoute + '/api/session-clear': typeof ApiSessionClearRoute + '/api/session-flash': typeof ApiSessionFlashRoute + '/api/session-helper-cookie': typeof ApiSessionHelperCookieRoute + '/api/session-hono': typeof ApiSessionHonoRoute + '/api/session-hono-community': typeof ApiSessionHonoCommunityRoute + '/api/session-hono-cookie': typeof ApiSessionHonoCookieRoute + '/api/session-iron': typeof ApiSessionIronRoute + '/api/session-middleware': typeof ApiSessionMiddlewareRoute + '/api/session-named': typeof ApiSessionNamedRoute + '/api/session-redirect': typeof ApiSessionRedirectRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/server-functions': typeof ServerFunctionsRoute + '/ssr': typeof SsrRoute + '/api/session': typeof ApiSessionRoute + '/api/session-clear': typeof ApiSessionClearRoute + '/api/session-flash': typeof ApiSessionFlashRoute + '/api/session-helper-cookie': typeof ApiSessionHelperCookieRoute + '/api/session-hono': typeof ApiSessionHonoRoute + '/api/session-hono-community': typeof ApiSessionHonoCommunityRoute + '/api/session-hono-cookie': typeof ApiSessionHonoCookieRoute + '/api/session-iron': typeof ApiSessionIronRoute + '/api/session-middleware': typeof ApiSessionMiddlewareRoute + '/api/session-named': typeof ApiSessionNamedRoute + '/api/session-redirect': typeof ApiSessionRedirectRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/server-functions' + | '/ssr' + | '/api/session' + | '/api/session-clear' + | '/api/session-flash' + | '/api/session-helper-cookie' + | '/api/session-hono' + | '/api/session-hono-community' + | '/api/session-hono-cookie' + | '/api/session-iron' + | '/api/session-middleware' + | '/api/session-named' + | '/api/session-redirect' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/server-functions' + | '/ssr' + | '/api/session' + | '/api/session-clear' + | '/api/session-flash' + | '/api/session-helper-cookie' + | '/api/session-hono' + | '/api/session-hono-community' + | '/api/session-hono-cookie' + | '/api/session-iron' + | '/api/session-middleware' + | '/api/session-named' + | '/api/session-redirect' + id: + | '__root__' + | '/' + | '/server-functions' + | '/ssr' + | '/api/session' + | '/api/session-clear' + | '/api/session-flash' + | '/api/session-helper-cookie' + | '/api/session-hono' + | '/api/session-hono-community' + | '/api/session-hono-cookie' + | '/api/session-iron' + | '/api/session-middleware' + | '/api/session-named' + | '/api/session-redirect' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ServerFunctionsRoute: typeof ServerFunctionsRoute + SsrRoute: typeof SsrRoute + ApiSessionRoute: typeof ApiSessionRoute + ApiSessionClearRoute: typeof ApiSessionClearRoute + ApiSessionFlashRoute: typeof ApiSessionFlashRoute + ApiSessionHelperCookieRoute: typeof ApiSessionHelperCookieRoute + ApiSessionHonoRoute: typeof ApiSessionHonoRoute + ApiSessionHonoCommunityRoute: typeof ApiSessionHonoCommunityRoute + ApiSessionHonoCookieRoute: typeof ApiSessionHonoCookieRoute + ApiSessionIronRoute: typeof ApiSessionIronRoute + ApiSessionMiddlewareRoute: typeof ApiSessionMiddlewareRoute + ApiSessionNamedRoute: typeof ApiSessionNamedRoute + ApiSessionRedirectRoute: typeof ApiSessionRedirectRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/server-functions': { + id: '/server-functions' + path: '/server-functions' + fullPath: '/server-functions' + preLoaderRoute: typeof ServerFunctionsRouteImport + parentRoute: typeof rootRouteImport + } + '/ssr': { + id: '/ssr' + path: '/ssr' + fullPath: '/ssr' + preLoaderRoute: typeof SsrRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session': { + id: '/api/session' + path: '/api/session' + fullPath: '/api/session' + preLoaderRoute: typeof ApiSessionRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-clear': { + id: '/api/session-clear' + path: '/api/session-clear' + fullPath: '/api/session-clear' + preLoaderRoute: typeof ApiSessionClearRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-flash': { + id: '/api/session-flash' + path: '/api/session-flash' + fullPath: '/api/session-flash' + preLoaderRoute: typeof ApiSessionFlashRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-helper-cookie': { + id: '/api/session-helper-cookie' + path: '/api/session-helper-cookie' + fullPath: '/api/session-helper-cookie' + preLoaderRoute: typeof ApiSessionHelperCookieRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-hono': { + id: '/api/session-hono' + path: '/api/session-hono' + fullPath: '/api/session-hono' + preLoaderRoute: typeof ApiSessionHonoRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-hono-community': { + id: '/api/session-hono-community' + path: '/api/session-hono-community' + fullPath: '/api/session-hono-community' + preLoaderRoute: typeof ApiSessionHonoCommunityRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-hono-cookie': { + id: '/api/session-hono-cookie' + path: '/api/session-hono-cookie' + fullPath: '/api/session-hono-cookie' + preLoaderRoute: typeof ApiSessionHonoCookieRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-iron': { + id: '/api/session-iron' + path: '/api/session-iron' + fullPath: '/api/session-iron' + preLoaderRoute: typeof ApiSessionIronRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-middleware': { + id: '/api/session-middleware' + path: '/api/session-middleware' + fullPath: '/api/session-middleware' + preLoaderRoute: typeof ApiSessionMiddlewareRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-named': { + id: '/api/session-named' + path: '/api/session-named' + fullPath: '/api/session-named' + preLoaderRoute: typeof ApiSessionNamedRouteImport + parentRoute: typeof rootRouteImport + } + '/api/session-redirect': { + id: '/api/session-redirect' + path: '/api/session-redirect' + fullPath: '/api/session-redirect' + preLoaderRoute: typeof ApiSessionRedirectRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ServerFunctionsRoute: ServerFunctionsRoute, + SsrRoute: SsrRoute, + ApiSessionRoute: ApiSessionRoute, + ApiSessionClearRoute: ApiSessionClearRoute, + ApiSessionFlashRoute: ApiSessionFlashRoute, + ApiSessionHelperCookieRoute: ApiSessionHelperCookieRoute, + ApiSessionHonoRoute: ApiSessionHonoRoute, + ApiSessionHonoCommunityRoute: ApiSessionHonoCommunityRoute, + ApiSessionHonoCookieRoute: ApiSessionHonoCookieRoute, + ApiSessionIronRoute: ApiSessionIronRoute, + ApiSessionMiddlewareRoute: ApiSessionMiddlewareRoute, + ApiSessionNamedRoute: ApiSessionNamedRoute, + ApiSessionRedirectRoute: ApiSessionRedirectRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { startInstance } from './start.ts' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + config: Awaited> + } +} diff --git a/e2e/react-start/session-handling/src/router.tsx b/e2e/react-start/session-handling/src/router.tsx new file mode 100644 index 0000000000..c5c2209e5a --- /dev/null +++ b/e2e/react-start/session-handling/src/router.tsx @@ -0,0 +1,13 @@ +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' +import { NotFound } from './components/NotFound' + +export function getRouter() { + return createRouter({ + routeTree, + defaultErrorComponent: DefaultCatchBoundary, + defaultNotFoundComponent: () => , + scrollRestoration: true, + }) +} diff --git a/e2e/react-start/session-handling/src/routes/__root.tsx b/e2e/react-start/session-handling/src/routes/__root.tsx new file mode 100644 index 0000000000..e5e5f4cd24 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/__root.tsx @@ -0,0 +1,59 @@ +/// +import * as React from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' +import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { NotFound } from '~/components/NotFound' +import '~/styles/app.css' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + ], + }), + errorComponent: (props) => { + return ( + + + + ) + }, + notFoundComponent: () => , + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + ) +} + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + + + {children} + + + + ) +} diff --git a/e2e/react-start/session-handling/src/routes/api/session-clear.ts b/e2e/react-start/session-handling/src/routes/api/session-clear.ts new file mode 100644 index 0000000000..44b83e58ac --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-clear.ts @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { destroySession } from '~/session' + +export const Route = createFileRoute('/api/session-clear')({ + server: { + handlers: { + POST: async () => { + await destroySession() + return Response.json({ cleared: true }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-flash.ts b/e2e/react-start/session-handling/src/routes/api/session-flash.ts new file mode 100644 index 0000000000..7b494d5050 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-flash.ts @@ -0,0 +1,22 @@ +import { createFileRoute } from '@tanstack/react-router' +import { readSession } from '~/session' + +export const Route = createFileRoute('/api/session-flash')({ + server: { + handlers: { + POST: async () => { + const session = await readSession() + session.notice = 'Saved successfully' + await session.save() + return Response.json({ saved: true }) + }, + GET: async () => { + const session = await readSession() + const notice = session.notice ?? null + delete session.notice + await session.save() + return Response.json({ notice }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-helper-cookie.ts b/e2e/react-start/session-handling/src/routes/api/session-helper-cookie.ts new file mode 100644 index 0000000000..24711e227c --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-helper-cookie.ts @@ -0,0 +1,21 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setCookie } from '@tanstack/react-start/server' +import { readJson, updateSessionData } from '~/session' + +export const Route = createFileRoute('/api/session-helper-cookie')({ + server: { + handlers: { + POST: async ({ request }) => { + const session = await updateSessionData(await readJson(request)) + setCookie('helper-session', '1', { path: '/' }) + const headers = new Headers() + headers.append( + 'Set-Cookie', + 'returned-session=1; Path=/; Expires=Tue, 01 Jan 2030 00:00:00 GMT', + ) + headers.append('Set-Cookie', 'returned-extra=2; Path=/') + return Response.json(session, { headers }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-hono-community.ts b/e2e/react-start/session-handling/src/routes/api/session-hono-community.ts new file mode 100644 index 0000000000..deb93ea549 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-hono-community.ts @@ -0,0 +1,12 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setCookie } from '@tanstack/react-start/server' +import { communitySessionApp } from '~/hono-sessions' + +function handle({ request }: { request: Request }) { + setCookie('start-side', 'coexists', { path: '/' }) + return communitySessionApp.fetch(request) +} + +export const Route = createFileRoute('/api/session-hono-community')({ + server: { handlers: { GET: handle, POST: handle, DELETE: handle } }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-hono-cookie.ts b/e2e/react-start/session-handling/src/routes/api/session-hono-cookie.ts new file mode 100644 index 0000000000..fb99ce6196 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-hono-cookie.ts @@ -0,0 +1,52 @@ +import { createFileRoute } from '@tanstack/react-router' +import { generateCookie, generateSignedCookie } from 'hono/cookie' +import { parseSigned } from 'hono/utils/cookie' +import { + appendResponseHeader, + getRequestHeader, + setCookie, +} from '@tanstack/react-start/server' +import { sessionPassword } from '~/session' + +// These Hono exports work with strings; they do not require a Hono Context. +// They provide signed cookies, not session storage or server-side expiration. +export const Route = createFileRoute('/api/session-hono-cookie')({ + server: { + handlers: { + GET: async () => { + const values = await parseSigned( + getRequestHeader('cookie') ?? '', + sessionPassword, + 'hono-signed', + ) + return Response.json({ user: values['hono-signed'] || null }) + }, + POST: async ({ request }) => { + const data = await request.json() + appendResponseHeader( + 'set-cookie', + await generateSignedCookie( + 'hono-signed', + data.user, + sessionPassword, + { + httpOnly: true, + sameSite: 'Lax', + path: '/', + maxAge: 3600, + }, + ), + ) + setCookie('start-side', 'coexists', { path: '/' }) + return Response.json({ user: data.user }) + }, + DELETE: () => { + appendResponseHeader( + 'set-cookie', + generateCookie('hono-signed', '', { path: '/', maxAge: 0 }), + ) + return Response.json({ cleared: true }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-hono.ts b/e2e/react-start/session-handling/src/routes/api/session-hono.ts new file mode 100644 index 0000000000..fdfd172bf0 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-hono.ts @@ -0,0 +1,12 @@ +import { createFileRoute } from '@tanstack/react-router' +import { setCookie } from '@tanstack/react-start/server' +import { honoSessionApp } from '~/hono-sessions' + +function handle({ request }: { request: Request }) { + setCookie('start-side', 'coexists', { path: '/' }) + return honoSessionApp.fetch(request) +} + +export const Route = createFileRoute('/api/session-hono')({ + server: { handlers: { GET: handle, POST: handle, DELETE: handle } }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-iron.ts b/e2e/react-start/session-handling/src/routes/api/session-iron.ts new file mode 100644 index 0000000000..83337d1dfb --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-iron.ts @@ -0,0 +1,28 @@ +import { createFileRoute } from '@tanstack/react-router' +import { readJson, readSession } from '~/session' + +export const Route = createFileRoute('/api/session-iron')({ + server: { + handlers: { + GET: async () => + Response.json({ data: { ...(await readSession('iron-session')) } }), + POST: async ({ request }) => { + const session = await readSession('iron-session') + const data = await readJson(request) + if (typeof data.user === 'string') { + session.user = data.user + } + if (typeof data.token === 'string') { + session.token = data.token + } + await session.save() + return Response.json({ data: { ...session } }) + }, + DELETE: async () => { + const session = await readSession('iron-session') + session.destroy() + return Response.json({ cleared: true }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-middleware.ts b/e2e/react-start/session-handling/src/routes/api/session-middleware.ts new file mode 100644 index 0000000000..4090262477 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-middleware.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' +import { sessionMiddleware } from '~/start' + +export const Route = createFileRoute('/api/session-middleware')({ + server: { + middleware: [sessionMiddleware], + handlers: { + GET: ({ context }) => Response.json({ data: { ...context.session } }), + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-named.ts b/e2e/react-start/session-handling/src/routes/api/session-named.ts new file mode 100644 index 0000000000..5acb82446c --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-named.ts @@ -0,0 +1,21 @@ +import { createFileRoute } from '@tanstack/react-router' +import { readJson, readSession, updateSessionData } from '~/session' + +function getName(request: Request) { + return new URL(request.url).searchParams.get('name') || 'app-named' +} + +export const Route = createFileRoute('/api/session-named')({ + server: { + handlers: { + GET: async ({ request }) => + Response.json({ + data: { ...(await readSession(getName(request))) }, + }), + POST: async ({ request }) => + Response.json( + await updateSessionData(await readJson(request), getName(request)), + ), + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session-redirect.ts b/e2e/react-start/session-handling/src/routes/api/session-redirect.ts new file mode 100644 index 0000000000..5280d7e6bc --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session-redirect.ts @@ -0,0 +1,13 @@ +import { createFileRoute, redirect } from '@tanstack/react-router' +import { updateSessionData } from '~/session' + +export const Route = createFileRoute('/api/session-redirect')({ + server: { + handlers: { + POST: async () => { + await updateSessionData({ user: 'redirected' }) + throw redirect({ href: '/api/session', statusCode: 303 }) + }, + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/api/session.ts b/e2e/react-start/session-handling/src/routes/api/session.ts new file mode 100644 index 0000000000..4696cf80a4 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/api/session.ts @@ -0,0 +1,12 @@ +import { createFileRoute } from '@tanstack/react-router' +import { readJson, readSession, updateSessionData } from '~/session' + +export const Route = createFileRoute('/api/session')({ + server: { + handlers: { + GET: async () => Response.json({ data: { ...(await readSession()) } }), + POST: async ({ request }) => + Response.json(await updateSessionData(await readJson(request))), + }, + }, +}) diff --git a/e2e/react-start/session-handling/src/routes/index.tsx b/e2e/react-start/session-handling/src/routes/index.tsx new file mode 100644 index 0000000000..9dc929d5bb --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/index.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

Session Handling E2E

+

This app contains HTTP-level session tests.

+
+ ) +} diff --git a/e2e/react-start/session-handling/src/routes/server-functions.tsx b/e2e/react-start/session-handling/src/routes/server-functions.tsx new file mode 100644 index 0000000000..bce5419c84 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/server-functions.tsx @@ -0,0 +1,85 @@ +import { ClientOnly, createFileRoute, redirect } from '@tanstack/react-router' +import { createServerFn, useServerFn } from '@tanstack/react-start' +import * as React from 'react' +import { destroySession, readSession, updateSessionData } from '~/session' + +const updateSessionFn = createServerFn({ method: 'POST' }).handler(async () => { + const data = { serverFn: 'updated' } + await updateSessionData(data) + return { data } +}) +const readSessionFn = createServerFn().handler(async () => { + const serverFn = (await readSession()).serverFn + return { data: typeof serverFn === 'string' ? { serverFn } : {} } +}) +const clearSessionFn = createServerFn({ method: 'POST' }).handler(async () => { + await destroySession() + return { cleared: true } +}) +const redirectSessionFn = createServerFn({ method: 'POST' }).handler( + async () => { + await updateSessionData({ serverFn: 'redirected' }) + throw redirect({ to: '/ssr' }) + }, +) +const errorSessionFn = createServerFn({ method: 'POST' }).handler(async () => { + await updateSessionData({ serverFn: 'error-persisted' }) + throw new Error('Expected external session error') +}) +const ironSessionFn = createServerFn({ method: 'POST' }).handler(async () => { + const session = await readSession('iron-session') + session.user = 'iron-server-function' + await session.save() + return { user: session.user } +}) + +export const Route = createFileRoute('/server-functions')({ + component: ServerFunctions, +}) + +function ServerFunctions() { + return ( +
+

External Session Server Functions

+ + + + + + + + +
+ ) +} + +function ServerFunctionButton({ + name, + fn, +}: { + name: string + fn: (...args: Array) => Promise +}) { + const serverFn = useServerFn(fn) + const [result, setResult] = React.useState('idle') + return ( +
+ + {result} +
+ ) +} diff --git a/e2e/react-start/session-handling/src/routes/ssr.tsx b/e2e/react-start/session-handling/src/routes/ssr.tsx new file mode 100644 index 0000000000..0339a4f813 --- /dev/null +++ b/e2e/react-start/session-handling/src/routes/ssr.tsx @@ -0,0 +1,26 @@ +import { createFileRoute } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import { readSession } from '~/session' + +const loadSession = createServerFn().handler(async () => { + const session = await readSession() + const count = Number(session.ssrCount ?? 0) + 1 + session.ssrCount = count + await session.save() + return { count } +}) + +export const Route = createFileRoute('/ssr')({ + loader: () => loadSession(), + component: SsrRoute, +}) + +function SsrRoute() { + const data = Route.useLoaderData() + return ( +
+

External Session SSR

+

{String(data.count)}

+
+ ) +} diff --git a/e2e/react-start/session-handling/src/session.ts b/e2e/react-start/session-handling/src/session.ts new file mode 100644 index 0000000000..f223c42cbd --- /dev/null +++ b/e2e/react-start/session-handling/src/session.ts @@ -0,0 +1,47 @@ +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' + +// Fixed secrets and insecure cookies are only for this local HTTP test fixture. +export const sessionPassword = 'start-external-session-test-only-'.repeat(2) +export type SessionData = { + user?: string + token?: string + serverFn?: string + middleware?: string + notice?: string + ssrCount?: number +} + +export async function updateSessionData(data: SessionData, name?: string) { + const session = await readSession(name) + Object.assign(session, data) + await session.save() + return { data: { ...session } } +} + +export async function destroySession() { + const session = await readSession() + session.destroy() +} + +export function readSession(cookieName = 'app-session') { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName, + password: sessionPassword, + ttl: 3600, + chunk: true, + cookieOptions: { + secure: false, + httpOnly: true, + sameSite: 'lax', + path: '/', + }, + }, + ) +} + +export async function readJson(request: Request): Promise { + return request.json() +} diff --git a/e2e/react-start/session-handling/src/start.ts b/e2e/react-start/session-handling/src/start.ts new file mode 100644 index 0000000000..a9571afabb --- /dev/null +++ b/e2e/react-start/session-handling/src/start.ts @@ -0,0 +1,22 @@ +import { createMiddleware, createStart } from '@tanstack/react-start' +import { readSession } from './session' + +export const sessionMiddleware = createMiddleware().server( + async ({ next, request }) => { + const session = await readSession() + const scenario = request.headers.get('x-session-middleware') + if (scenario === 'before') { + session.middleware = 'before' + } + const result = await next({ context: { session } }) + if (scenario === 'after') { + session.middleware = 'after' + } + if (scenario) { + await session.save() + } + return result + }, +) + +export const startInstance = createStart(() => ({})) diff --git a/e2e/react-start/session-handling/src/styles/app.css b/e2e/react-start/session-handling/src/styles/app.css new file mode 100644 index 0000000000..a38fb439a6 --- /dev/null +++ b/e2e/react-start/session-handling/src/styles/app.css @@ -0,0 +1,12 @@ +html { + color-scheme: light dark; + font-family: system-ui, sans-serif; +} + +body { + margin: 0; +} + +main { + padding: 16px; +} diff --git a/e2e/react-start/session-handling/tests/session-handling.spec.ts b/e2e/react-start/session-handling/tests/session-handling.spec.ts new file mode 100644 index 0000000000..aaa975ccef --- /dev/null +++ b/e2e/react-start/session-handling/tests/session-handling.spec.ts @@ -0,0 +1,334 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { APIResponse, Page, Response } from '@playwright/test' + +async function setCookieValues(response: APIResponse | Response) { + return (await Promise.resolve(response.headersArray())) + .filter((item) => item.name.toLowerCase() === 'set-cookie') + .map((item) => item.value) +} + +function expectCookie(cookies: Array, name: string) { + expect(cookies.some((cookie) => cookie.startsWith(`${name}=`))).toBe(true) +} + +async function expectResult(page: Page, name: string, value: string) { + await expect( + page.getByTestId(`server-function-${name}-result`), + ).toContainText(value) +} + +async function visitFunctions(page: Page) { + await page.goto('/server-functions') + await expect(page.getByTestId('server-functions-hydrated')).toBeAttached() +} + +test.describe('iron-session in Start', () => { + test('does not write cookies on a read and persists committed mutations', async ({ + request, + }) => { + const initial = await request.get('/api/session') + expect(await initial.json()).toEqual({ data: {} }) + expect(await setCookieValues(initial)).toEqual([]) + + const update = await request.post('/api/session', { + data: { user: 'tanner' }, + }) + const cookies = await setCookieValues(update) + expectCookie(cookies, 'app-session') + expect(cookies[0]).toContain('HttpOnly') + expect(cookies[0]).toContain('SameSite=Lax') + expect(cookies[0]).toContain('Path=/') + + const read = await request.get('/api/session') + expect(await read.json()).toEqual({ data: { user: 'tanner' } }) + expect(await setCookieValues(read)).toEqual([]) + }) + + test('destroy logs out the cookie jar', async ({ request }) => { + await request.post('/api/session', { data: { user: 'clear-me' } }) + const clear = await request.post('/api/session-clear') + const cookies = await setCookieValues(clear) + expectCookie(cookies, 'app-session') + expect(cookies[0]).toContain('Max-Age=0') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: {}, + }) + }) + + test('independent named sessions coexist', async ({ request }) => { + await request.post('/api/session', { data: { user: 'default-user' } }) + await request.post('/api/session-named?name=app-account', { + data: { user: 'account-user' }, + }) + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'default-user' }, + }) + expect( + await (await request.get('/api/session-named?name=app-account')).json(), + ).toEqual({ data: { user: 'account-user' } }) + }) + + test('invalid input does not become authenticated session data', async ({ + request, + }) => { + const response = await request.get('/api/session', { + headers: { cookie: 'app-session=invalid' }, + }) + expect(await response.json()).toEqual({ data: {} }) + expect(await setCookieValues(response)).toEqual([]) + }) + + test('preserves library, helper, and returned cookies including Expires commas', async ({ + request, + }) => { + const response = await request.post('/api/session-helper-cookie', { + data: { user: 'coexists' }, + }) + const cookies = await setCookieValues(response) + expect(cookies).toHaveLength(4) + for (const name of [ + 'app-session', + 'helper-session', + 'returned-session', + 'returned-extra', + ]) { + expectCookie(cookies, name) + } + expect( + cookies.find((cookie) => cookie.startsWith('returned-session=')), + ).toContain('Expires=Tue, 01 Jan 2030 00:00:00 GMT') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'coexists' }, + }) + }) + + test('a notification is consumed once after its deletion is saved', async ({ + request, + }) => { + await request.post('/api/session-flash') + expect(await (await request.get('/api/session-flash')).json()).toEqual({ + notice: 'Saved successfully', + }) + expect(await (await request.get('/api/session-flash')).json()).toEqual({ + notice: null, + }) + }) + + test('session mutations survive a thrown Start redirect', async ({ + request, + }) => { + const response = await request.post('/api/session-redirect', { + maxRedirects: 0, + }) + expect(response.status()).toBe(303) + expect(response.headers().location).toBe('/api/session') + expectCookie(await setCookieValues(response), 'app-session') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'redirected' }, + }) + }) + + test('middleware shares the session object and commits changes after next', async ({ + request, + }) => { + const before = await request.get('/api/session-middleware', { + headers: { 'x-session-middleware': 'before' }, + }) + expect(await before.json()).toEqual({ data: { middleware: 'before' } }) + expectCookie(await setCookieValues(before), 'app-session') + const after = await request.get('/api/session-middleware', { + headers: { 'x-session-middleware': 'after' }, + }) + expect(await after.json()).toEqual({ data: { middleware: 'before' } }) + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { middleware: 'after' }, + }) + }) +}) + +test.describe('iron-session cookie jar adapter', () => { + test('saves, reads, and destroys encrypted sessions using Start cookie helpers', async ({ + request, + }) => { + const saved = await request.post('/api/session-iron', { + data: { user: 'iron-user' }, + }) + expectCookie(await setCookieValues(saved), 'iron-session') + expect(await (await request.get('/api/session-iron')).json()).toEqual({ + data: { user: 'iron-user' }, + }) + await request.delete('/api/session-iron') + expect(await (await request.get('/api/session-iron')).json()).toEqual({ + data: {}, + }) + }) + + test('roundtrips chunked cookies and deletes obsolete chunks after shrinking', async ({ + request, + }) => { + const large = await request.post('/api/session-iron', { + data: { token: 'x'.repeat(5000) }, + }) + const cookies = await setCookieValues(large) + expectCookie(cookies, 'iron-session.0') + expectCookie(cookies, 'iron-session.1') + expect( + (await (await request.get('/api/session-iron')).json()).data.token, + ).toHaveLength(5000) + const small = await request.post('/api/session-iron', { + data: { token: 'tiny' }, + }) + const smallCookies = await setCookieValues(small) + expectCookie(smallCookies, 'iron-session') + expect( + smallCookies.some( + (cookie) => + cookie.startsWith('iron-session.1=') && /Max-Age=0/i.test(cookie), + ), + ).toBe(true) + expect( + (await (await request.get('/api/session-iron')).json()).data.token, + ).toBe('tiny') + }) +}) + +test.describe('Hono applications mounted in Start server routes', () => { + for (const [path, cookieName] of [ + ['session-hono', 'sid'], + ['session-hono-community', 'hono-community'], + ]) { + test(`${path} persists and clears sessions after Hono middleware completes`, async ({ + request, + }) => { + const saved = await request.post(`/api/${path}`, { + data: { user: 'hono-user' }, + }) + expect(saved.status()).toBe(200) + const cookies = await setCookieValues(saved) + expectCookie(cookies, cookieName!) + expectCookie(cookies, 'start-side') + if (path === 'session-hono') { + expectCookie(cookies, 'hono-extra') + } + expect((await (await request.get(`/api/${path}`)).json()).data.user).toBe( + 'hono-user', + ) + await request.delete(`/api/${path}`) + expect( + (await (await request.get(`/api/${path}`)).json()).data.user ?? null, + ).toBeNull() + }) + } + + test('Hono context-free signed cookie helpers work directly in Start', async ({ + request, + }) => { + const saved = await request.post('/api/session-hono-cookie', { + data: { user: 'signed-user' }, + }) + expectCookie(await setCookieValues(saved), 'hono-signed') + expectCookie(await setCookieValues(saved), 'start-side') + expect( + await (await request.get('/api/session-hono-cookie')).json(), + ).toEqual({ user: 'signed-user' }) + await request.delete('/api/session-hono-cookie') + expect( + await (await request.get('/api/session-hono-cookie')).json(), + ).toEqual({ user: null }) + }) +}) + +test.describe('document and server function sessions', () => { + test('SSR loader commits persist across browser reloads', async ({ + page, + }) => { + await page.goto('/ssr') + await expect(page.getByTestId('ssr-session-count')).toHaveText('1') + await page.reload() + await expect(page.getByTestId('ssr-session-count')).toHaveText('2') + }) + + test('server functions update, read, and clear the browser session', async ({ + page, + }) => { + await visitFunctions(page) + const responsePromise = page.waitForResponse((response) => + response.url().includes('/_serverFn/'), + ) + await page.getByTestId('server-function-update').click() + expectCookie(await setCookieValues(await responsePromise), 'app-session') + await expectResult(page, 'update', '"serverFn":"updated"') + await page.getByTestId('server-function-read').click() + await expectResult(page, 'read', '"serverFn":"updated"') + await page.getByTestId('server-function-clear').click() + await expectResult(page, 'clear', '"cleared":true') + await page.getByTestId('server-function-read').click() + await expectResult(page, 'read', '"data":{}') + }) + + test('server function redirects retain committed session data', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-redirect').click() + await expect(page).toHaveURL(/\/ssr$/) + await expect(page.getByTestId('ssr-session-count')).toHaveText('1') + expect( + (await (await page.request.get('/api/session')).json()).data.serverFn, + ).toBe('redirected') + }) + + test.describe('expected server function error', () => { + test.use({ + whitelistErrors: [ + /Failed to load resource: the server responded with a status of 500/, + ], + }) + test('server function errors retain committed session data', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-error').click() + await expectResult(page, 'error', 'Expected external session error') + expect( + (await (await page.request.get('/api/session')).json()).data.serverFn, + ).toBe('error-persisted') + }) + }) + + test('iron-session cookie jar works in browser-invoked server functions', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-iron').click() + await expectResult(page, 'iron', 'iron-server-function') + expect( + (await (await page.request.get('/api/session-iron')).json()).data.user, + ).toBe('iron-server-function') + }) + + test('separate browser contexts retain independent sessions', async ({ + browser, + baseURL, + }) => { + const first = await browser.newContext({ baseURL }) + const second = await browser.newContext({ baseURL }) + try { + const firstPage = await first.newPage() + const secondPage = await second.newPage() + const [firstResponse, secondResponse] = await Promise.all([ + firstPage.goto('/ssr'), + secondPage.goto('/ssr'), + ]) + expect(firstResponse?.ok()).toBe(true) + expect(secondResponse?.ok()).toBe(true) + await firstPage.reload() + await expect(firstPage.getByTestId('ssr-session-count')).toHaveText('2') + await expect(secondPage.getByTestId('ssr-session-count')).toHaveText('1') + } finally { + await first.close() + await second.close() + } + }) +}) diff --git a/e2e/react-start/session-handling/tsconfig.json b/e2e/react-start/session-handling/tsconfig.json new file mode 100644 index 0000000000..c7a0597e4b --- /dev/null +++ b/e2e/react-start/session-handling/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/react-start/session-handling/vite.config.ts b/e2e/react-start/session-handling/vite.config.ts new file mode 100644 index 0000000000..ef9695579b --- /dev/null +++ b/e2e/react-start/session-handling/vite.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + plugins: [tanstackStart(), viteReact()], +}) diff --git a/e2e/react-start/split-base-and-basepath/package.json b/e2e/react-start/split-base-and-basepath/package.json index 5a973cb1c4..7f0e62766c 100644 --- a/e2e/react-start/split-base-and-basepath/package.json +++ b/e2e/react-start/split-base-and-basepath/package.json @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/start-manifest/package.json b/e2e/react-start/start-manifest/package.json index aca05beb9d..d5367558e8 100644 --- a/e2e/react-start/start-manifest/package.json +++ b/e2e/react-start/start-manifest/package.json @@ -21,7 +21,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/start-manifest/tests/start-manifest.spec.ts b/e2e/react-start/start-manifest/tests/start-manifest.spec.ts index 7dfa390997..bd7bd20e98 100644 --- a/e2e/react-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/react-start/start-manifest/tests/start-manifest.spec.ts @@ -27,12 +27,6 @@ async function getBackgroundColor(testId: string, page: Page) { .evaluate((element) => getComputedStyle(element).backgroundColor) } -async function getBorderTopColor(testId: string, page: Page) { - return page - .getByTestId(testId) - .evaluate((element) => getComputedStyle(element).borderTopColor) -} - function getStylesheetHrefsFromHtml(html: string) { return Array.from( html.matchAll(/]+rel="stylesheet"[^>]+href="([^"]+)"/g), @@ -362,24 +356,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -389,28 +378,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -422,17 +402,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -442,19 +413,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) diff --git a/e2e/react-start/static-server-functions/package.json b/e2e/react-start/static-server-functions/package.json index 3e16293058..85f08d19c9 100644 --- a/e2e/react-start/static-server-functions/package.json +++ b/e2e/react-start/static-server-functions/package.json @@ -15,7 +15,7 @@ "@tanstack/react-router": "workspace:*", "@tanstack/react-start": "workspace:*", "@tanstack/start-static-server-functions": "workspace:*", - "nitro": "^3.0.1-alpha.2", + "nitro": "^3.0.260903-beta", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json index d0e3757175..1d08a07622 100644 --- a/e2e/react-start/streaming-ssr/package.json +++ b/e2e/react-start/streaming-ssr/package.json @@ -28,7 +28,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/transform-asset-urls/package.json b/e2e/react-start/transform-asset-urls/package.json index 3bb8550995..e0a5ffec59 100644 --- a/e2e/react-start/transform-asset-urls/package.json +++ b/e2e/react-start/transform-asset-urls/package.json @@ -46,7 +46,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json index 0c44d745f8..c415d1845e 100644 --- a/e2e/react-start/virtual-routes/package.json +++ b/e2e/react-start/virtual-routes/package.json @@ -31,7 +31,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json index 97f3e5bd11..1a5c3e1f4e 100644 --- a/e2e/react-start/website/package.json +++ b/e2e/react-start/website/package.json @@ -29,7 +29,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js index 2d6ea80c1b..68d31fe754 100644 --- a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js @@ -6,7 +6,6 @@ export default { plugins: [ tanstackRouter({ target: 'solid', - autoCodeSplitting: true, }), solidPlugin(), ], diff --git a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts index c7cbb94b56..7601b581cc 100644 --- a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts @@ -1451,7 +1451,7 @@ declare module '@tanstack/solid-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/solid-router/rspack-basic-file-based/package.json b/e2e/solid-router/rspack-basic-file-based/package.json index 020bcb9ff6..4015f0f606 100644 --- a/e2e/solid-router/rspack-basic-file-based/package.json +++ b/e2e/solid-router/rspack-basic-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json index a89a44deb7..3772d7beb1 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json index b6853ca410..a95d6f73d1 100644 --- a/e2e/solid-start/basic-auth/package.json +++ b/e2e/solid-start/basic-auth/package.json @@ -19,6 +19,7 @@ "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", + "iron-session": "^9.0.1", "redaxios": "catalog:", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" @@ -30,7 +31,7 @@ "@types/node": "^22.10.2", "dotenv": "^17.2.3", "prisma": "^7.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/basic-auth/src/routes/__root.tsx b/e2e/solid-start/basic-auth/src/routes/__root.tsx index 3a3392e922..8068b7a331 100644 --- a/e2e/solid-start/basic-auth/src/routes/__root.tsx +++ b/e2e/solid-start/basic-auth/src/routes/__root.tsx @@ -15,18 +15,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/e2e/solid-start/basic-auth/src/routes/_authed.tsx b/e2e/solid-start/basic-auth/src/routes/_authed.tsx index a42aac212a..e204d2e3a0 100644 --- a/e2e/solid-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/solid-start/basic-auth/src/routes/_authed.tsx @@ -3,7 +3,7 @@ import { createServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,12 +37,11 @@ export const loginFn = createServerFn({ } // Create a session - const session = await useAppSession() + const session = await getAppSession() // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/solid-start/basic-auth/src/routes/logout.tsx b/e2e/solid-start/basic-auth/src/routes/logout.tsx index 85b1670a5f..5c69eb516d 100644 --- a/e2e/solid-start/basic-auth/src/routes/logout.tsx +++ b/e2e/solid-start/basic-auth/src/routes/logout.tsx @@ -1,12 +1,12 @@ import { redirect, createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() + const session = await getAppSession() - session.clear() + session.destroy() throw redirect({ href: '/', diff --git a/e2e/solid-start/basic-auth/src/routes/signup.tsx b/e2e/solid-start/basic-auth/src/routes/signup.tsx index 2142574faa..155f816883 100644 --- a/e2e/solid-start/basic-auth/src/routes/signup.tsx +++ b/e2e/solid-start/basic-auth/src/routes/signup.tsx @@ -4,7 +4,7 @@ import { createServerFn, useServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST', @@ -24,7 +24,7 @@ export const signupFn = createServerFn({ const password = await hashPassword(payload.password) // Create a session - const session = await useAppSession() + const session = await getAppSession() if (found) { if (found.password !== password) { @@ -36,9 +36,8 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -55,9 +54,8 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/e2e/solid-start/basic-auth/src/utils/session.ts b/e2e/solid-start/basic-auth/src/utils/session.ts index 6aac388545..728332d28f 100644 --- a/e2e/solid-start/basic-auth/src/utils/session.ts +++ b/e2e/solid-start/basic-auth/src/utils/session.ts @@ -1,13 +1,25 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/solid-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/solid-start/server' import type { User } from '~/prisma-generated/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'test-auth-session', + // This fixture only runs locally with test credentials. + password: 'local-e2e-only-session-password-at-least-32-characters', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json index 167bc4a314..468a67877b 100644 --- a/e2e/solid-start/basic-solid-query/package.json +++ b/e2e/solid-start/basic-solid-query/package.json @@ -28,7 +28,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json index bb8ed5f7bc..8d720d5ce4 100644 --- a/e2e/solid-start/basic-tsr-config/package.json +++ b/e2e/solid-start/basic-tsr-config/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index f6a814705d..e83ed11775 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", @@ -36,7 +36,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/csp/package.json b/e2e/solid-start/csp/package.json index 46263c78ee..f233a87d67 100644 --- a/e2e/solid-start/csp/package.json +++ b/e2e/solid-start/csp/package.json @@ -19,7 +19,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/css-modules/package.json b/e2e/solid-start/css-modules/package.json index 98bcb0a108..107659f43c 100644 --- a/e2e/solid-start/css-modules/package.json +++ b/e2e/solid-start/css-modules/package.json @@ -23,7 +23,7 @@ "@tanstack/router-e2e-utils": "workspace:*", "@types/node": "^22.10.2", "sass": "^1.97.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json index ccd5861e04..9113db133b 100644 --- a/e2e/solid-start/custom-basepath/package.json +++ b/e2e/solid-start/custom-basepath/package.json @@ -25,7 +25,7 @@ "@types/express": "^5.0.6", "@types/node": "^22.10.2", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/solid-start/deferred-hydration/package.json b/e2e/solid-start/deferred-hydration/package.json index b1cb6cce3b..4e2a3a1665 100644 --- a/e2e/solid-start/deferred-hydration/package.json +++ b/e2e/solid-start/deferred-hydration/package.json @@ -23,12 +23,12 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/dev-ssr-styles/.gitignore b/e2e/solid-start/dev-ssr-styles/.gitignore new file mode 100644 index 0000000000..950326609c --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/.gitignore @@ -0,0 +1,7 @@ +node_modules +dist +.routeTree.gen.ts +src/routeTree.gen.ts +test-results +playwright-report +port*.txt diff --git a/e2e/solid-start/dev-ssr-styles/package.json b/e2e/solid-start/dev-ssr-styles/package.json new file mode 100644 index 0000000000..6ca79c15c6 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/package.json @@ -0,0 +1,31 @@ +{ + "name": "tanstack-solid-start-e2e-dev-ssr-styles", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev --port 0", + "build": "vite build && tsc --noEmit", + "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "test:e2e:dev": "MODE=dev playwright test --project=chromium", + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:dev:bundled-dev", + "test:e2e:dev:bundled-dev": "MODE=dev E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/solid-router": "workspace:*", + "@tanstack/solid-start": "workspace:*", + "solid-js": "^1.9.10" + }, + "devDependencies": { + "@playwright/test": "^1.61.0", + "@tanstack/router-core": "workspace:*", + "@tanstack/router-e2e-utils": "workspace:*", + "@types/node": "^22.10.2", + "srvx": "^1.0.0", + "typescript": "npm:@typescript/typescript6@^6.0.2", + "vite": "^8.0.14", + "vite-plugin-solid": "^2.11.11", + "@typescript/native": "npm:typescript@^7.0.2" + } +} diff --git a/e2e/solid-start/dev-ssr-styles/playwright.config.ts b/e2e/solid-start/dev-ssr-styles/playwright.config.ts new file mode 100644 index 0000000000..723cd32789 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/playwright.config.ts @@ -0,0 +1,28 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL }, + webServer: { + command: 'pnpm dev:e2e', + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + env: { + VITE_NODE_ENV: 'test', + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/solid-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx b/e2e/solid-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx new file mode 100644 index 0000000000..02d924dd10 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx @@ -0,0 +1,9 @@ +import styles from '../styles/code-split-route.module.css' + +export function CodeSplitStyledBox() { + return ( +
+ This box is styled by a code-split route component. +
+ ) +} diff --git a/e2e/solid-start/dev-ssr-styles/src/router.tsx b/e2e/solid-start/dev-ssr-styles/src/router.tsx new file mode 100644 index 0000000000..73b487af4d --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/router.tsx @@ -0,0 +1,10 @@ +import { createRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + return createRouter({ + routeTree, + scrollRestoration: true, + defaultPreload: false, + }) +} diff --git a/e2e/solid-start/dev-ssr-styles/src/routes/__root.tsx b/e2e/solid-start/dev-ssr-styles/src/routes/__root.tsx new file mode 100644 index 0000000000..47a50b5716 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/routes/__root.tsx @@ -0,0 +1,27 @@ +import { + HeadContent, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/solid-router' +import { HydrationScript } from 'solid-js/web' +import '~/styles/app.css' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + + + + + + + + ) +} diff --git a/e2e/solid-start/dev-ssr-styles/src/routes/index.tsx b/e2e/solid-start/dev-ssr-styles/src/routes/index.tsx new file mode 100644 index 0000000000..73e6f1e89d --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/routes/index.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { CodeSplitStyledBox } from '../components/CodeSplitStyledBox' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

Solid Dev SSR Styles Test

+ +
+ ) +} diff --git a/e2e/solid-start/dev-ssr-styles/src/styles/app.css b/e2e/solid-start/dev-ssr-styles/src/styles/app.css new file mode 100644 index 0000000000..9a67f9b153 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/styles/app.css @@ -0,0 +1,5 @@ +body { + font-family: sans-serif; + margin: 0; + padding: 20px; +} diff --git a/e2e/solid-start/dev-ssr-styles/src/styles/code-split-route.module.css b/e2e/solid-start/dev-ssr-styles/src/styles/code-split-route.module.css new file mode 100644 index 0000000000..75a73ca7c3 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/src/styles/code-split-route.module.css @@ -0,0 +1,6 @@ +.styledBox { + --solid-code-split-style-marker: present; + background-color: #3b82f6; + color: white; + padding: 24px; +} diff --git a/e2e/solid-start/dev-ssr-styles/tests/app.spec.ts b/e2e/solid-start/dev-ssr-styles/tests/app.spec.ts new file mode 100644 index 0000000000..25bd317a72 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/tests/app.spec.ts @@ -0,0 +1,61 @@ +import { expect } from '@playwright/test' +import { DEV_STYLES_ATTR } from '@tanstack/router-core' +import { test } from '@tanstack/router-e2e-utils' + +const whitelistErrors = [ + 'Failed to load resource: net::ERR_NAME_NOT_RESOLVED', + 'Failed to load resource: the server responded with a status of 504', +] + +test.describe('dev SSR styles', () => { + test.use({ whitelistErrors }) + + test.describe('with JavaScript disabled', () => { + test.use({ javaScriptEnabled: false, whitelistErrors }) + + test('includes CSS from a code-split route component during SSR', async ({ + page, + }) => { + await page.goto('/') + + const element = page.getByTestId('styled-box') + await expect(element).toBeVisible() + await expect(element).toHaveCSS('background-color', 'rgb(59, 130, 246)') + + const href = await page + .locator(`link[${DEV_STYLES_ATTR}]`) + .getAttribute('href') + expect(href).toBeTruthy() + + const response = await page.request.get(new URL(href!, page.url()).href) + expect(response.ok()).toBeTruthy() + expect(await response.text()).toContain( + '/* /src/styles/code-split-route.module.css */', + ) + }) + }) + + test('keeps CSS output stable after client modules load', async ({ + page, + }) => { + const initialResponsePromise = page.waitForResponse((response) => + new URL(response.url()).pathname.endsWith('/@tanstack-start/styles.css'), + ) + await page.goto('/') + await expect(page.getByTestId('styled-box')).toBeVisible() + const initialResponse = await initialResponsePromise + expect(initialResponse.ok()).toBeTruthy() + const initialCss = await initialResponse.text() + + const reloadedResponsePromise = page.waitForResponse((response) => + new URL(response.url()).pathname.endsWith('/@tanstack-start/styles.css'), + ) + await page.reload() + await expect(page.getByTestId('styled-box')).toBeVisible() + const reloadedResponse = await reloadedResponsePromise + expect(reloadedResponse.ok()).toBeTruthy() + const reloadedCss = await reloadedResponse.text() + + expect(reloadedCss).toBe(initialCss) + }) +}) diff --git a/e2e/solid-start/dev-ssr-styles/tests/setup/global.setup.ts b/e2e/solid-start/dev-ssr-styles/tests/setup/global.setup.ts new file mode 100644 index 0000000000..b03b6485c8 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/tests/setup/global.setup.ts @@ -0,0 +1,15 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') { + return + } + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + }) +} diff --git a/e2e/solid-start/dev-ssr-styles/tsconfig.json b/e2e/solid-start/dev-ssr-styles/tsconfig.json new file mode 100644 index 0000000000..c34f9d7c36 --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/tsconfig.json @@ -0,0 +1,23 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/solid-start/dev-ssr-styles/vite.config.ts b/e2e/solid-start/dev-ssr-styles/vite.config.ts new file mode 100644 index 0000000000..fa59f4af6d --- /dev/null +++ b/e2e/solid-start/dev-ssr-styles/vite.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import viteSolid from 'vite-plugin-solid' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + experimental: + process.env.E2E_VITE_BUNDLED_DEV === 'true' + ? { bundledDev: true } + : undefined, + server: { port: 3000 }, + plugins: [tanstackStart(), viteSolid({ ssr: true })], +}) diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json index 461a26f77c..8cb355490d 100644 --- a/e2e/solid-start/scroll-restoration/package.json +++ b/e2e/solid-start/scroll-restoration/package.json @@ -26,7 +26,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json index 695f516172..8cb10e1780 100644 --- a/e2e/solid-start/selective-ssr/package.json +++ b/e2e/solid-start/selective-ssr/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/serialization-adapters/package.json b/e2e/solid-start/serialization-adapters/package.json index 8d950fb451..659944ac5f 100644 --- a/e2e/solid-start/serialization-adapters/package.json +++ b/e2e/solid-start/serialization-adapters/package.json @@ -22,7 +22,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json index 3667ccaf4b..ef8e6a4c5a 100644 --- a/e2e/solid-start/server-functions/package.json +++ b/e2e/solid-start/server-functions/package.json @@ -30,7 +30,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json index f10fc07c2b..0caf0cb795 100644 --- a/e2e/solid-start/server-routes/package.json +++ b/e2e/solid-start/server-routes/package.json @@ -30,7 +30,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/start-manifest/package.json b/e2e/solid-start/start-manifest/package.json index beeb6ab258..a47d7475b5 100644 --- a/e2e/solid-start/start-manifest/package.json +++ b/e2e/solid-start/start-manifest/package.json @@ -18,7 +18,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts b/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts index 836f62a97f..ba74448d54 100644 --- a/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts @@ -356,24 +356,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -383,27 +378,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. + await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -415,17 +402,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -435,19 +413,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) diff --git a/e2e/solid-start/streaming-ssr/package.json b/e2e/solid-start/streaming-ssr/package.json index 61c1fc99a4..135614e439 100644 --- a/e2e/solid-start/streaming-ssr/package.json +++ b/e2e/solid-start/streaming-ssr/package.json @@ -23,7 +23,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json index 1639f85394..7c7a12dbdb 100644 --- a/e2e/solid-start/virtual-routes/package.json +++ b/e2e/solid-start/virtual-routes/package.json @@ -27,7 +27,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json index 22b223318b..4c4044d334 100644 --- a/e2e/solid-start/website/package.json +++ b/e2e/solid-start/website/package.json @@ -25,7 +25,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js index c4aba8798e..16f6fbca44 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js @@ -9,7 +9,6 @@ export default { }), tanstackRouter({ target: 'vue', - autoCodeSplitting: true, }), ], } diff --git a/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts b/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts index 3922025c82..5922c5f7b1 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts +++ b/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts @@ -364,7 +364,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts b/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts index 09d62b0706..0bfdddab3d 100644 --- a/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts +++ b/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts @@ -454,7 +454,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/vue-router/rspack-basic-file-based/package.json b/e2e/vue-router/rspack-basic-file-based/package.json index b420125e51..93439f7d5b 100644 --- a/e2e/vue-router/rspack-basic-file-based/package.json +++ b/e2e/vue-router/rspack-basic-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json index f1259e5e7a..536435a09e 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json index a0b52a5af0..7f6fb798da 100644 --- a/e2e/vue-start/basic-auth/package.json +++ b/e2e/vue-start/basic-auth/package.json @@ -19,6 +19,7 @@ "@tanstack/vue-router": "workspace:^", "@tanstack/vue-router-devtools": "workspace:^", "@tanstack/vue-start": "workspace:^", + "iron-session": "^9.0.1", "redaxios": "catalog:", "tailwind-merge": "^3.6.0", "vue": "^3.5.25" @@ -32,7 +33,7 @@ "@vitejs/plugin-vue-jsx": "^5.1.5", "dotenv": "^17.2.3", "prisma": "^7.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/basic-auth/src/routes/__root.tsx b/e2e/vue-start/basic-auth/src/routes/__root.tsx index f486bf4cb7..e5b6f6778f 100644 --- a/e2e/vue-start/basic-auth/src/routes/__root.tsx +++ b/e2e/vue-start/basic-auth/src/routes/__root.tsx @@ -16,18 +16,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/e2e/vue-start/basic-auth/src/routes/_authed.tsx b/e2e/vue-start/basic-auth/src/routes/_authed.tsx index ba88e3beac..606de3e487 100644 --- a/e2e/vue-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/vue-start/basic-auth/src/routes/_authed.tsx @@ -3,7 +3,7 @@ import { createServerFn } from '@tanstack/vue-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,12 +37,11 @@ export const loginFn = createServerFn({ } // Create a session - const session = await useAppSession() + const session = await getAppSession() // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/vue-start/basic-auth/src/routes/logout.tsx b/e2e/vue-start/basic-auth/src/routes/logout.tsx index f1d7b58e29..8372b33608 100644 --- a/e2e/vue-start/basic-auth/src/routes/logout.tsx +++ b/e2e/vue-start/basic-auth/src/routes/logout.tsx @@ -1,12 +1,12 @@ import { redirect, createFileRoute } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() + const session = await getAppSession() - session.clear() + session.destroy() throw redirect({ href: '/', diff --git a/e2e/vue-start/basic-auth/src/routes/signup.tsx b/e2e/vue-start/basic-auth/src/routes/signup.tsx index eade8363e6..5f37f109c7 100644 --- a/e2e/vue-start/basic-auth/src/routes/signup.tsx +++ b/e2e/vue-start/basic-auth/src/routes/signup.tsx @@ -5,7 +5,7 @@ import { defineComponent } from 'vue' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST', @@ -25,7 +25,7 @@ export const signupFn = createServerFn({ const password = await hashPassword(payload.password) // Create a session - const session = await useAppSession() + const session = await getAppSession() if (found) { if (found.password !== password) { @@ -37,9 +37,8 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -56,9 +55,8 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/e2e/vue-start/basic-auth/src/utils/session.ts b/e2e/vue-start/basic-auth/src/utils/session.ts index 7cf2a41792..7d078225a0 100644 --- a/e2e/vue-start/basic-auth/src/utils/session.ts +++ b/e2e/vue-start/basic-auth/src/utils/session.ts @@ -1,13 +1,25 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/vue-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/vue-start/server' import type { User } from '~/prisma-generated/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'test-auth-session', + // This fixture only runs locally with test credentials. + password: 'local-e2e-only-session-password-at-least-32-characters', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } diff --git a/e2e/vue-start/basic-tsr-config/package.json b/e2e/vue-start/basic-tsr-config/package.json index 6f50cc6314..828dce5b2a 100644 --- a/e2e/vue-start/basic-tsr-config/package.json +++ b/e2e/vue-start/basic-tsr-config/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "@vitejs/plugin-vue": "^6.0.5", diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json index 09e60b66f7..ab9589376d 100644 --- a/e2e/vue-start/basic-vue-query/package.json +++ b/e2e/vue-start/basic-vue-query/package.json @@ -30,7 +30,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index c321586d1d..2ff8329543 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", @@ -39,7 +39,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/css-modules/package.json b/e2e/vue-start/css-modules/package.json index 507264b72d..3671774644 100644 --- a/e2e/vue-start/css-modules/package.json +++ b/e2e/vue-start/css-modules/package.json @@ -24,7 +24,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", "sass": "^1.97.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/custom-basepath/package.json b/e2e/vue-start/custom-basepath/package.json index 5b8b98a8ce..c1032ea88b 100644 --- a/e2e/vue-start/custom-basepath/package.json +++ b/e2e/vue-start/custom-basepath/package.json @@ -25,7 +25,7 @@ "@types/express": "^5.0.6", "@types/node": "^22.10.2", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/vue-start/dev-ssr-styles/.gitignore b/e2e/vue-start/dev-ssr-styles/.gitignore new file mode 100644 index 0000000000..950326609c --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/.gitignore @@ -0,0 +1,7 @@ +node_modules +dist +.routeTree.gen.ts +src/routeTree.gen.ts +test-results +playwright-report +port*.txt diff --git a/e2e/vue-start/dev-ssr-styles/package.json b/e2e/vue-start/dev-ssr-styles/package.json new file mode 100644 index 0000000000..0033a0a5cc --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/package.json @@ -0,0 +1,32 @@ +{ + "name": "tanstack-vue-start-e2e-dev-ssr-styles", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev --port 0", + "build": "vite build && tsc --noEmit", + "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "test:e2e:dev": "MODE=dev playwright test --project=chromium", + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:dev:bundled-dev", + "test:e2e:dev:bundled-dev": "MODE=dev E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/vue-router": "workspace:*", + "@tanstack/vue-start": "workspace:*", + "vue": "^3.5.16" + }, + "devDependencies": { + "@playwright/test": "^1.61.0", + "@tanstack/router-core": "workspace:*", + "@tanstack/router-e2e-utils": "workspace:*", + "@types/node": "^22.10.2", + "@vitejs/plugin-vue": "^6.0.5", + "@vitejs/plugin-vue-jsx": "^5.1.5", + "srvx": "^1.0.0", + "typescript": "npm:@typescript/typescript6@^6.0.2", + "vite": "^8.0.14", + "@typescript/native": "npm:typescript@^7.0.2" + } +} diff --git a/e2e/vue-start/dev-ssr-styles/playwright.config.ts b/e2e/vue-start/dev-ssr-styles/playwright.config.ts new file mode 100644 index 0000000000..723cd32789 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/playwright.config.ts @@ -0,0 +1,28 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL }, + webServer: { + command: 'pnpm dev:e2e', + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + env: { + VITE_NODE_ENV: 'test', + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/vue-start/dev-ssr-styles/src/components/SfcStyledBox.vue b/e2e/vue-start/dev-ssr-styles/src/components/SfcStyledBox.vue new file mode 100644 index 0000000000..bd92215136 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/components/SfcStyledBox.vue @@ -0,0 +1,14 @@ + + + diff --git a/e2e/vue-start/dev-ssr-styles/src/router.tsx b/e2e/vue-start/dev-ssr-styles/src/router.tsx new file mode 100644 index 0000000000..c0d7f2b200 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/router.tsx @@ -0,0 +1,10 @@ +import { createRouter } from '@tanstack/vue-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + return createRouter({ + routeTree, + scrollRestoration: true, + defaultPreload: false, + }) +} diff --git a/e2e/vue-start/dev-ssr-styles/src/routes/__root.tsx b/e2e/vue-start/dev-ssr-styles/src/routes/__root.tsx new file mode 100644 index 0000000000..0dec479a07 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/routes/__root.tsx @@ -0,0 +1,27 @@ +import { + Body, + HeadContent, + Html, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/vue-router' +import '~/styles/app.css' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + + + + + + + ) +} diff --git a/e2e/vue-start/dev-ssr-styles/src/routes/index.tsx b/e2e/vue-start/dev-ssr-styles/src/routes/index.tsx new file mode 100644 index 0000000000..733bc1d559 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/routes/index.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/vue-router' +import SfcStyledBox from '../components/SfcStyledBox.vue' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

Vue Dev SSR Styles Test

+ +
+ ) +} diff --git a/e2e/vue-start/dev-ssr-styles/src/styles/app.css b/e2e/vue-start/dev-ssr-styles/src/styles/app.css new file mode 100644 index 0000000000..9a67f9b153 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/styles/app.css @@ -0,0 +1,5 @@ +body { + font-family: sans-serif; + margin: 0; + padding: 20px; +} diff --git a/e2e/vue-start/dev-ssr-styles/src/vue-shim.d.ts b/e2e/vue-start/dev-ssr-styles/src/vue-shim.d.ts new file mode 100644 index 0000000000..fe00a856b2 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/src/vue-shim.d.ts @@ -0,0 +1,6 @@ +declare module '*.vue' { + import type { DefineComponent } from 'vue' + + const component: DefineComponent + export default component +} diff --git a/e2e/vue-start/dev-ssr-styles/tests/app.spec.ts b/e2e/vue-start/dev-ssr-styles/tests/app.spec.ts new file mode 100644 index 0000000000..0e052441b7 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/tests/app.spec.ts @@ -0,0 +1,61 @@ +import { expect } from '@playwright/test' +import { DEV_STYLES_ATTR } from '@tanstack/router-core' +import { test } from '@tanstack/router-e2e-utils' + +const whitelistErrors = [ + 'Failed to load resource: net::ERR_NAME_NOT_RESOLVED', + 'Failed to load resource: the server responded with a status of 504', +] + +test.describe('dev SSR styles', () => { + test.use({ whitelistErrors }) + + test.describe('with JavaScript disabled', () => { + test.use({ javaScriptEnabled: false, whitelistErrors }) + + test('includes a Vue SFC style block during SSR', async ({ page }) => { + await page.goto('/') + + const element = page.getByTestId('styled-box') + await expect(element).toBeVisible() + await expect(element).toHaveCSS('background-color', 'rgb(126, 34, 206)') + + const href = await page + .locator(`link[${DEV_STYLES_ATTR}]`) + .getAttribute('href') + expect(href).toBeTruthy() + + const response = await page.request.get(new URL(href!, page.url()).href) + expect(response.ok()).toBeTruthy() + const css = await response.text() + expect(css).toContain('--vue-sfc-style-marker') + expect(css).toMatch( + /\/src\/components\/SfcStyledBox\.vue\?vue&type=style[^\n]*&lang\.css/, + ) + }) + }) + + test('keeps CSS output stable after client modules load', async ({ + page, + }) => { + const initialResponsePromise = page.waitForResponse((response) => + new URL(response.url()).pathname.endsWith('/@tanstack-start/styles.css'), + ) + await page.goto('/') + await expect(page.getByTestId('styled-box')).toBeVisible() + const initialResponse = await initialResponsePromise + expect(initialResponse.ok()).toBeTruthy() + const initialCss = await initialResponse.text() + + const reloadedResponsePromise = page.waitForResponse((response) => + new URL(response.url()).pathname.endsWith('/@tanstack-start/styles.css'), + ) + await page.reload() + await expect(page.getByTestId('styled-box')).toBeVisible() + const reloadedResponse = await reloadedResponsePromise + expect(reloadedResponse.ok()).toBeTruthy() + const reloadedCss = await reloadedResponse.text() + + expect(reloadedCss).toBe(initialCss) + }) +}) diff --git a/e2e/vue-start/dev-ssr-styles/tests/setup/global.setup.ts b/e2e/vue-start/dev-ssr-styles/tests/setup/global.setup.ts new file mode 100644 index 0000000000..b03b6485c8 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/tests/setup/global.setup.ts @@ -0,0 +1,15 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') { + return + } + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + }) +} diff --git a/e2e/vue-start/dev-ssr-styles/tsconfig.json b/e2e/vue-start/dev-ssr-styles/tsconfig.json new file mode 100644 index 0000000000..898ea214b1 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/tsconfig.json @@ -0,0 +1,23 @@ +{ + "include": ["**/*.ts", "**/*.tsx", "**/*.vue"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "vue", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/vue-start/dev-ssr-styles/vite.config.ts b/e2e/vue-start/dev-ssr-styles/vite.config.ts new file mode 100644 index 0000000000..f8b7293af9 --- /dev/null +++ b/e2e/vue-start/dev-ssr-styles/vite.config.ts @@ -0,0 +1,14 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/vue-start/plugin/vite' +import vue from '@vitejs/plugin-vue' +import vueJsx from '@vitejs/plugin-vue-jsx' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + experimental: + process.env.E2E_VITE_BUNDLED_DEV === 'true' + ? { bundledDev: true } + : undefined, + server: { port: 3000 }, + plugins: [tanstackStart(), vue(), vueJsx()], +}) diff --git a/e2e/vue-start/scroll-restoration/package.json b/e2e/vue-start/scroll-restoration/package.json index 7024b2827e..025b0225be 100644 --- a/e2e/vue-start/scroll-restoration/package.json +++ b/e2e/vue-start/scroll-restoration/package.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/selective-ssr/package.json b/e2e/vue-start/selective-ssr/package.json index 1da6f8de30..b555a01c26 100644 --- a/e2e/vue-start/selective-ssr/package.json +++ b/e2e/vue-start/selective-ssr/package.json @@ -22,7 +22,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/serialization-adapters/package.json b/e2e/vue-start/serialization-adapters/package.json index 5434dd0e78..a056e21da3 100644 --- a/e2e/vue-start/serialization-adapters/package.json +++ b/e2e/vue-start/serialization-adapters/package.json @@ -23,7 +23,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json index deffebabd7..dd1a7a9c6b 100644 --- a/e2e/vue-start/server-functions/package.json +++ b/e2e/vue-start/server-functions/package.json @@ -32,7 +32,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/server-routes/package.json b/e2e/vue-start/server-routes/package.json index 40d285d1d9..6a8e1babed 100644 --- a/e2e/vue-start/server-routes/package.json +++ b/e2e/vue-start/server-routes/package.json @@ -32,7 +32,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/start-manifest/package.json b/e2e/vue-start/start-manifest/package.json index dbf889db71..ae682f7a9d 100644 --- a/e2e/vue-start/start-manifest/package.json +++ b/e2e/vue-start/start-manifest/package.json @@ -19,7 +19,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts b/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts index 6c0f0d15ab..4d5bea0a33 100644 --- a/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts @@ -372,24 +372,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -399,27 +394,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. + await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -431,17 +418,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -451,19 +429,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) diff --git a/e2e/vue-start/streaming-ssr/package.json b/e2e/vue-start/streaming-ssr/package.json index 42d311824e..382120860a 100644 --- a/e2e/vue-start/streaming-ssr/package.json +++ b/e2e/vue-start/streaming-ssr/package.json @@ -24,7 +24,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/virtual-routes/package.json b/e2e/vue-start/virtual-routes/package.json index 19cd20ff42..90f09ce911 100644 --- a/e2e/vue-start/virtual-routes/package.json +++ b/e2e/vue-start/virtual-routes/package.json @@ -29,7 +29,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/website/package.json b/e2e/vue-start/website/package.json index ccb03ae8f0..6c30b1500f 100644 --- a/e2e/vue-start/website/package.json +++ b/e2e/vue-start/website/package.json @@ -27,7 +27,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 09b7ea7ed2..1efa172047 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 1f66c97c21..6af48f1d34 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 0ea069260d..96c68fecd4 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index ff86384aac..ccae95d73f 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 40710c347f..9c3cacada1 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 2910358d80..32e856ebcf 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 1b1da5c22f..d01a02872e 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 7d7ede1a55..edab96afac 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 621311c997..3222c33e19 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index 43aa8c8f7c..c3c87c8d88 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index e75bb75988..84d326435c 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index f0c6db9217..c04cb6012e 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 5ce1c929cb..2c09a3dfdf 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 6ed9b61c60..99afb661ee 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 25e1258efc..88140e8911 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 585b12c54e..e02defb3ce 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index b81bf11139..e3dd032ac2 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index d1e9db300d..14d0dc8e86 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 0a4e3f60e8..f738efc37e 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index b15bb13b8b..23d469d120 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index c165069dac..fe005c0d2f 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,8 +12,8 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 0dd8a4f73d..a7677dfd51 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/esbuild.config.js b/examples/react/quickstart-esbuild-file-based/esbuild.config.js index fb7950d1fa..2f83a79984 100644 --- a/examples/react/quickstart-esbuild-file-based/esbuild.config.js +++ b/examples/react/quickstart-esbuild-file-based/esbuild.config.js @@ -7,5 +7,5 @@ export default { bundle: true, format: 'esm', target: ['esnext'], - plugins: [tanstackRouter({ target: 'react', autoCodeSplitting: true })], + plugins: [tanstackRouter({ target: 'react' })], } diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 2cbb377a85..d855694fec 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 6ca5236b7d..976ec838d1 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index b4110e08bf..824998f428 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "postcss": "^8.5.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index ddba5fc358..baa14b89dd 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 73d131378f..b6db476ea8 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index de5ac60fe8..b158eeda56 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 59b68d58f0..f0994165c2 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -16,7 +16,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index a58b096975..1397db14b5 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -9,10 +9,10 @@ "types": "./dist/index.d.ts", "dependencies": { "@router-mono-react-query/post-query": "workspace:*", - "@tanstack/history": "^1.162.4", + "@tanstack/history": "^1.162.5", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 10dc01c314..e044d86681 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 48d2ae7206..cfc7a94942 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index ba511891a9..afd4702b5d 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/history": "^1.162.5", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index fc68e1ee9e..800d948c81 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 30f39f4a52..a06431ef86 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index f6c543e8da..391b72e610 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/history": "^1.162.5", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 325cd7d0d7..704ff13838 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 67c8a90523..35e041e825 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", @@ -26,7 +26,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@testing-library/jest-dom": "^6.6.3", + "@testing-library/jest-dom": "^7.0.1", "@testing-library/react": "^16.2.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", @@ -35,6 +35,6 @@ "jsdom": "^27.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4" + "vitest": "^5.0.4" } } diff --git a/examples/react/search-validator-adapters/tests/arktype.test.tsx b/examples/react/search-validator-adapters/tests/arktype.test.tsx index 1c3a1baf76..776cc8369e 100644 --- a/examples/react/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/react/search-validator-adapters/tests/arktype.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/react-router' -import '@testing-library/jest-dom/vitest' import { type } from 'arktype' test('can navigate to the route', async () => { diff --git a/examples/react/search-validator-adapters/tests/jest-dom.setup.ts b/examples/react/search-validator-adapters/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/examples/react/search-validator-adapters/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/examples/react/search-validator-adapters/tests/valibot.test.tsx b/examples/react/search-validator-adapters/tests/valibot.test.tsx index 3680d2302c..d3e18db414 100644 --- a/examples/react/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/react/search-validator-adapters/tests/valibot.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/react-router' import * as v from 'valibot' -import '@testing-library/jest-dom/vitest' test('can navigate to the route', async () => { const rootRoute = createRootRoute() diff --git a/examples/react/search-validator-adapters/vite.config.ts b/examples/react/search-validator-adapters/vite.config.ts index 5b41e6e26b..e4b93f5cc3 100644 --- a/examples/react/search-validator-adapters/vite.config.ts +++ b/examples/react/search-validator-adapters/vite.config.ts @@ -11,6 +11,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, plugins: [ tailwindcss(), diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 8bf0b58659..4ab9aff272 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-basic-auth/README.md b/examples/react/start-basic-auth/README.md index 4e5ee29b40..7f1b093ba5 100644 --- a/examples/react/start-basic-auth/README.md +++ b/examples/react/start-basic-auth/README.md @@ -39,3 +39,13 @@ This example demonstrates: - Protected routes - Login/logout functionality - Redirect after authentication + +## Session configuration + +This example uses [iron-session](https://github.com/vvo/iron-session) through Start's `getCookie` and `setCookie` helpers. Set `SESSION_PASSWORD` to a random secret of at least 32 characters before starting the app, for example: + +```sh +export SESSION_PASSWORD="$(openssl rand -base64 32)" +``` + +Keep the same secret across instances and deployments that must read the same sessions. The cookie requires HTTPS in production. Each handler reads its own session, then awaits `session.save()` before redirecting or returning. diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 70f7d7fcdc..9ab89bdac9 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,10 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", + "iron-session": "^9.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-auth/src/routes/__root.tsx b/examples/react/start-basic-auth/src/routes/__root.tsx index 5728345fcf..3367c62f27 100644 --- a/examples/react/start-basic-auth/src/routes/__root.tsx +++ b/examples/react/start-basic-auth/src/routes/__root.tsx @@ -13,18 +13,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/examples/react/start-basic-auth/src/routes/_authed.tsx b/examples/react/start-basic-auth/src/routes/_authed.tsx index 3af371e844..0b5c6f9047 100644 --- a/examples/react/start-basic-auth/src/routes/_authed.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed.tsx @@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,13 +33,10 @@ export const loginFn = createServerFn({ method: 'POST' }) } } - // Create a session - const session = await useAppSession() - // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/examples/react/start-basic-auth/src/routes/logout.tsx b/examples/react/start-basic-auth/src/routes/logout.tsx index 28f3c9f8fe..73cdaf1600 100644 --- a/examples/react/start-basic-auth/src/routes/logout.tsx +++ b/examples/react/start-basic-auth/src/routes/logout.tsx @@ -1,11 +1,10 @@ import { redirect, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await useAppSession() - - session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ href: '/', diff --git a/examples/react/start-basic-auth/src/routes/signup.tsx b/examples/react/start-basic-auth/src/routes/signup.tsx index 247a94c03c..4dc8e350ac 100644 --- a/examples/react/start-basic-auth/src/routes/signup.tsx +++ b/examples/react/start-basic-auth/src/routes/signup.tsx @@ -3,7 +3,7 @@ import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,9 +20,6 @@ export const signupFn = createServerFn({ method: 'POST' }) // Encrypt the password using Sha256 into plaintext const password = await hashPassword(data.password) - // Create a session - const session = await useAppSession() - if (found) { if (found.password !== password) { return { @@ -33,9 +30,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + const session = await getAppSession() + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -52,9 +49,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/examples/react/start-basic-auth/src/utils/session.ts b/examples/react/start-basic-auth/src/utils/session.ts index c38bac1e48..7df7bc4da2 100644 --- a/examples/react/start-basic-auth/src/utils/session.ts +++ b/examples/react/start-basic-auth/src/utils/session.ts @@ -1,13 +1,29 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/react-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + const password = process.env.SESSION_PASSWORD + if (!password || password.length < 32) { + throw new Error('Set SESSION_PASSWORD to at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + sameSite: 'lax', + secure: process.env.NODE_ENV === 'production', + path: '/', + }, + }, + ) } diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 798ca34f45..e9fa789ea6 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 815925fd3e..2108922446 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index bf8a6d26e9..9d819d4390 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 3065c2ba39..bea4ba26ef 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,22 +10,22 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" }, "devDependencies": { - "@rsbuild/core": "^2.0.11", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@rsbuild/plugin-tailwindcss": "^2.0.3", "@types/node": "25.0.9", "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", - "srvx": "^0.11.18", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 94b94775ba..58d573ca36 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", - "@tanstack/start-static-server-functions": "^1.167.38", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", + "@tanstack/start-static-server-functions": "^1.167.44", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 66d9f5987f..46df8e4650 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", @@ -24,7 +24,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 70c2a4af09..24f7113912 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-start": "^1.169.6", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" @@ -38,7 +38,7 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4", + "vitest": "^5.0.4", "web-vitals": "^5.1.0" } } diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index aff3e95b30..022300e159 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,14 +11,14 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwind-merge": "^3.6.0" }, "devDependencies": { diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 29e3494cc4..3452f910d0 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.169.6", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 3508fb17f7..8f4673143e 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-i18n-paraglide/package.json b/examples/react/start-i18n-paraglide/package.json index b78c8e6228..074f714d5c 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.1.1", "react-dom": "^19.1.1" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 8f9e225cf4..f9f86b81d1 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 2839c9061c..1647e95f20 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/README.md b/examples/react/start-next-migration/README.md index 50bb58380a..03bb53244e 100644 --- a/examples/react/start-next-migration/README.md +++ b/examples/react/start-next-migration/README.md @@ -6,7 +6,7 @@ The private page saves one article in an encrypted session cookie. This keeps th ## Run -Use Node 24 or newer and pnpm 11. From the repository root: +Use Node 24 or newer and pnpm 12. From the repository root: ```sh pnpm install @@ -23,7 +23,7 @@ export DEMO_PASSWORD='choose-a-local-demo-password' Run `pnpm dev:next` for Next.js at and `pnpm dev` in another terminal for Start at . Sign in as `reader@example.com` using the password you set. -The apps use different cookie names and session formats. Signing in to one does not sign you in to the other. Changing `SESSION_PASSWORD` invalidates that app's session. Saved state is tied to that session, not durable account storage. +Both apps use iron-session, with different cookie names. Signing in to one does not sign you in to the other. Changing `SESSION_PASSWORD` invalidates that app's session. Saved state is tied to that session, not durable account storage. ## Check the migration @@ -50,7 +50,7 @@ For a production-mode smoke check, keep the environment variables set and run `p | `generateMetadata` | Route `head` using `loaderData` | | `next-app/app/actions.ts` | `src/server/account.ts` | | Server Action form and `revalidatePath` | `useServerFn`, local pending state, `router.invalidate` | -| `cookies()` with `iron-session` | `useSession` | +| `cookies()` with `iron-session` | `iron-session` with `getCookie` / `setCookie` | | `next-app/next.config.ts` redirect | `src/routes/old-notes.tsx` redirect | | `next-app/app/sitemap.ts` | `src/routes/sitemap[.]xml.ts` server route | diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index c365d555a9..0c2a2a9563 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,9 +12,9 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-start": "^1.168.59", - "iron-session": "^9.0.0", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-start": "^1.169.6", + "iron-session": "^9.0.1", "next": "16.3.4", "react": "^19.2.3", "react-dom": "^19.2.3" @@ -25,7 +25,7 @@ "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" }, diff --git a/examples/react/start-next-migration/src/server/account.ts b/examples/react/start-next-migration/src/server/account.ts index e8fc5833a9..85e921c74b 100644 --- a/examples/react/start-next-migration/src/server/account.ts +++ b/examples/react/start-next-migration/src/server/account.ts @@ -1,6 +1,8 @@ +import { getIronSession } from 'iron-session' import { createServerFn } from '@tanstack/react-start' import { - useSession, + getCookie, + setCookie, setResponseStatus, setResponseHeader, } from '@tanstack/react-start/server' @@ -11,16 +13,26 @@ async function session() { if (!password || password.length < 32) { throw new Error('Set SESSION_PASSWORD to at least 32 characters') } - return useSession<{ email: string; saved: boolean }>({ - name: 'start-migration-session', - password, - }) + return getIronSession<{ email: string; saved: boolean }>( + { read: getCookie, write: setCookie }, + { + cookieName: 'start-migration-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + secure: process.env.NODE_ENV === 'production', + sameSite: 'lax', + path: '/', + }, + }, + ) } export const getAccount = createServerFn({ method: 'GET' }).handler( async () => { const current = await session() - return current.data.email - ? { email: current.data.email, saved: current.data.saved ?? false } + return current.email + ? { email: current.email, saved: current.saved ?? false } : null }, ) @@ -42,21 +54,24 @@ export const signIn = createServerFn({ method: 'POST' }) return { error: 'Invalid credentials' } } const current = await session() - await current.update({ email: data.email, saved: false }) + current.email = data.email + current.saved = false + await current.save() return { error: '' } }) export const toggleSaved = createServerFn({ method: 'POST' }).handler( async () => { const current = await session() - if (!current.data.email) { + if (!current.email) { setResponseStatus(401) throw new Error('Unauthorized') } - await current.update({ saved: !current.data.saved }) + current.saved = !current.saved + await current.save() }, ) export const signOut = createServerFn({ method: 'POST' }).handler(async () => { const current = await session() - await current.clear() + current.destroy() throw redirect({ to: '/login' }) }) diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index c00e7a55cd..00c88681d7 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "dexie": "^4.0.10", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -26,8 +26,8 @@ "@types/react": "^19.2.2", "@types/react-dom": "^19.2.2", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.30", - "nitro": "^3.0.260311-beta", + "@vitejs/plugin-rsc": "^0.5.39", + "nitro": "^3.0.260903-beta", "tailwindcss": "^4.1.18", "typescript": "^5.7.2", "vite": "^8.0.14" diff --git a/examples/react/start-streaming-data-from-server-functions/package.json b/examples/react/start-streaming-data-from-server-functions/package.json index 06de97786e..762bbff733 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 057e37f534..0bf4b2c246 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 3828761570..b58fbe4ff0 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index d4a0e62951..7755d227fc 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.169.6", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index b0f95f34be..0ab7e89c2d 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 03715bd570..0be3c60e8f 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 6b2a6584f3..c606070dfb 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3f253c17ef..11df7bf03b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 416d55c3fd..5612419cae 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index e8bed7ffe5..110b4d2621 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "firebase": "^11.4.0", "redaxios": "^0.5.1", "simple-icons": "^14.9.0", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index 1b0ac9a259..ea7d05c902 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 7199987de4..830df7b9cf 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 9b4105e4b5..e7d608f5fe 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 022ee7cd9a..867118382e 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 62b48a8fa5..c8e00ee43e 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 364b7b396b..fdb5f05f52 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,15 +13,15 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 92534998dd..7b132b11a1 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 8c59282b86..e3699970a9 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -20,7 +20,7 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 881ae633c1..92367442fc 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index abd6208dec..801b452192 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index e4643a6d24..a9cc6360a5 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index b1c7e55471..95ec804011 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 0a41821b81..56114afd04 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 51baa39b13..6493a3c7c8 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 1b3fb511b1..8cd73e38ff 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index e3ba18f052..25a1c29953 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,11 +10,11 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 0182cb34c2..7a7dc81025 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 100685148b..08ad918a60 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index a4da1300fe..cd758ab704 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,10 +12,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index a5a8aaa55f..7d2fbb6756 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 8e4c9ce263..2338d32305 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/quickstart-esbuild-file-based/build.js b/examples/solid/quickstart-esbuild-file-based/build.js index f8d31fbbd9..af5e01b4cd 100644 --- a/examples/solid/quickstart-esbuild-file-based/build.js +++ b/examples/solid/quickstart-esbuild-file-based/build.js @@ -14,10 +14,7 @@ const ctx = await esbuild.context({ target: ['esnext'], sourcemap: true, conditions: ['style'], - plugins: [ - solidPlugin(), - tanstackRouter({ target: 'solid', autoCodeSplitting: true }), - ], + plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], }) if (isDev) { diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index b2b846492d..9bcc9a08d0 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 6b655f1ee1..920154566d 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index e58f521ba3..2d9c886ac3 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "postcss": "^8.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index bba936a622..16167be207 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,15 +7,15 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.169.0", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index c557555fd9..454382e8cc 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index 52fff0114a..1d60ab2765 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json index 976a2ad861..a2e018fa96 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json @@ -20,7 +20,7 @@ "@vitejs/plugin-react": "^6.0.1", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index 5f28049d68..0672c42931 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/history": "^1.162.5", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 87a60b7782..3770256692 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/app/package.json b/examples/solid/router-monorepo-simple/packages/app/package.json index b10a4109b5..61234ac455 100644 --- a/examples/solid/router-monorepo-simple/packages/app/package.json +++ b/examples/solid/router-monorepo-simple/packages/app/package.json @@ -17,7 +17,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "vite": "^8.0.14", "tailwindcss": "^4.2.2", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index ea825b7076..ca08511d3e 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/history": "^1.162.5", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 60e781abd4..3d9fd2e2d0 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/app/package.json b/examples/solid/router-monorepo-solid-query/packages/app/package.json index 80f711e201..76bb059de5 100644 --- a/examples/solid/router-monorepo-solid-query/packages/app/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/app/package.json @@ -18,7 +18,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 11e27b2f39..93943a1df8 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", + "@tanstack/history": "^1.162.5", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 66c90340e9..eaa5a5aaea 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 437f9b5a05..59991edb36 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", @@ -25,13 +25,13 @@ "zod": "^3.24.2" }, "devDependencies": { - "@testing-library/jest-dom": "^6.6.3", + "@testing-library/jest-dom": "^7.0.1", "@solidjs/testing-library": "^0.8.10", "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "jsdom": "^27.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4" + "vitest": "^5.0.4" } } diff --git a/examples/solid/search-validator-adapters/tests/arktype.test.tsx b/examples/solid/search-validator-adapters/tests/arktype.test.tsx index 4ec555fc7b..f22a359995 100644 --- a/examples/solid/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/solid/search-validator-adapters/tests/arktype.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/solid-router' -import '@testing-library/jest-dom/vitest' import { type } from 'arktype' test('can navigate to the route', async () => { diff --git a/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts b/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/examples/solid/search-validator-adapters/tests/valibot.test.tsx b/examples/solid/search-validator-adapters/tests/valibot.test.tsx index cd4545397c..8594c1cb29 100644 --- a/examples/solid/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/solid/search-validator-adapters/tests/valibot.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/solid-router' import * as v from 'valibot' -import '@testing-library/jest-dom/vitest' test('can navigate to the route', async () => { const rootRoute = createRootRoute() diff --git a/examples/solid/search-validator-adapters/vite.config.ts b/examples/solid/search-validator-adapters/vite.config.ts index 5b9dbebfef..4e05d81e75 100644 --- a/examples/solid/search-validator-adapters/vite.config.ts +++ b/examples/solid/search-validator-adapters/vite.config.ts @@ -11,6 +11,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], server: { deps: { inline: [/@solidjs/, /@tanstack\/solid-store/], diff --git a/examples/solid/start-basic-auth/README.md b/examples/solid/start-basic-auth/README.md index 90cba4aac1..313c930051 100644 --- a/examples/solid/start-basic-auth/README.md +++ b/examples/solid/start-basic-auth/README.md @@ -70,3 +70,13 @@ pnpm dev > [!WARNING] > You will need to update the `docs/config.json` file (in the project's repo) if you add a new doc page! + +## Session configuration + +This example uses [iron-session](https://github.com/vvo/iron-session) through Start's `getCookie` and `setCookie` helpers. Set `SESSION_PASSWORD` to a random secret of at least 32 characters before starting the app, for example: + +```sh +export SESSION_PASSWORD="$(openssl rand -base64 32)" +``` + +Keep the same secret across instances and deployments that must read the same sessions. The cookie requires HTTPS in production. Each handler reads its own session, then awaits `session.save()` before redirecting or returning. diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index f1dc374ff1..d686fdf616 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,10 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", + "iron-session": "^9.0.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-auth/src/routes/__root.tsx b/examples/solid/start-basic-auth/src/routes/__root.tsx index 3aa0bfa18b..05ad0d298a 100644 --- a/examples/solid/start-basic-auth/src/routes/__root.tsx +++ b/examples/solid/start-basic-auth/src/routes/__root.tsx @@ -14,18 +14,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/examples/solid/start-basic-auth/src/routes/_authed.tsx b/examples/solid/start-basic-auth/src/routes/_authed.tsx index 60ad613e56..cded7ca880 100644 --- a/examples/solid/start-basic-auth/src/routes/_authed.tsx +++ b/examples/solid/start-basic-auth/src/routes/_authed.tsx @@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,13 +33,10 @@ export const loginFn = createServerFn({ method: 'POST' }) } } - // Create a session - const session = await useAppSession() - // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/examples/solid/start-basic-auth/src/routes/logout.tsx b/examples/solid/start-basic-auth/src/routes/logout.tsx index f7d624ff15..56cd70cbc2 100644 --- a/examples/solid/start-basic-auth/src/routes/logout.tsx +++ b/examples/solid/start-basic-auth/src/routes/logout.tsx @@ -1,11 +1,10 @@ import { createFileRoute, redirect } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await useAppSession() - - session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ href: '/', diff --git a/examples/solid/start-basic-auth/src/routes/signup.tsx b/examples/solid/start-basic-auth/src/routes/signup.tsx index 7cb9ae7161..b8d6bf89fa 100644 --- a/examples/solid/start-basic-auth/src/routes/signup.tsx +++ b/examples/solid/start-basic-auth/src/routes/signup.tsx @@ -3,7 +3,7 @@ import { createServerFn, useServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,9 +20,6 @@ export const signupFn = createServerFn({ method: 'POST' }) // Encrypt the password using Sha256 into plaintext const password = await hashPassword(data.password) - // Create a session - const session = await useAppSession() - if (found) { if (found.password !== password) { return { @@ -33,9 +30,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + const session = await getAppSession() + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -52,9 +49,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/examples/solid/start-basic-auth/src/utils/session.ts b/examples/solid/start-basic-auth/src/utils/session.ts index 120a410b60..4577764d28 100644 --- a/examples/solid/start-basic-auth/src/utils/session.ts +++ b/examples/solid/start-basic-auth/src/utils/session.ts @@ -1,13 +1,29 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/solid-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/solid-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + const password = process.env.SESSION_PASSWORD + if (!password || password.length < 32) { + throw new Error('Set SESSION_PASSWORD to at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + sameSite: 'lax', + secure: process.env.NODE_ENV === 'production', + path: '/', + }, + }, + ) } diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index af3c5ea0a9..2c910663bd 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index d5c5709181..7ece143f61 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index ae129053d4..69299cdb79 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index d40d96e2cb..2c0dc7dad6 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,15 +9,15 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { "@tailwindcss/vite": "^4.2.2", "@types/node": "^22.5.4", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index ecd73d92c4..ddbb7d8764 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 5b8a5571a2..8b639da68a 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", - "@tanstack/start-static-server-functions": "^1.167.38", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", + "@tanstack/start-static-server-functions": "^1.167.44", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 2cc32e2a01..758815b669 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" @@ -20,7 +20,7 @@ "devDependencies": { "@tailwindcss/vite": "^4.2.2", "@types/node": "^22.5.4", - "nitro": "^3.0.260311-beta", + "nitro": "^3.0.260903-beta", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 00c9e74977..d1ad9a9563 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.56", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-start": "^1.169.6", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, @@ -35,7 +35,7 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4", + "vitest": "^5.0.4", "web-vitals": "^5.1.0" } } diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json index 8e3e77ecc7..ea13a1c1e3 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "better-auth": "^1.6.19", "clsx": "^2.1.1", "convex": "^1.28.2", diff --git a/examples/solid/start-counter/package.json b/examples/solid/start-counter/package.json index 202c2eab5a..8b49c516bd 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json index 304f36d516..076c9b41dc 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 0e1ea333fb..83f3589cc2 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-streaming-data-from-server-functions/package.json b/examples/solid/start-streaming-data-from-server-functions/package.json index dc20fa777c..83e0719b39 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "zod": "^4.4.3" }, diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json index 3a1b92f76c..81ab5cd63c 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 4578e7001c..94db6ac790 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 54e1ab07ab..2acb2432bf 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index b4b271c63f..449d8a3927 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "solid-motionone": "^1.0.4", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 8a52f09805..46d33436db 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index e9891e1f43..9cc36a6991 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/vue-router": "^1.170.36", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts b/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts index 3922025c82..5922c5f7b1 100644 --- a/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts +++ b/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts @@ -364,7 +364,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 5c698cced8..87ab2c332b 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/vue-router": "^1.170.36", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts b/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts index 09d62b0706..0bfdddab3d 100644 --- a/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts +++ b/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts @@ -454,7 +454,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index b1695cffd6..af74afff3a 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.36", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "vue": "^3.5.13", "tailwindcss": "4.1.18" diff --git a/labeler-config.yml b/labeler-config.yml index c1ad49328e..9da92bf7ff 100644 --- a/labeler-config.yml +++ b/labeler-config.yml @@ -10,9 +10,6 @@ 'package: history': - changed-files: - any-glob-to-any-file: 'packages/history/**/*' -'package: nitro-v2-vite-plugin': - - changed-files: - - any-glob-to-any-file: 'packages/nitro-v2-vite-plugin/**/*' 'package: react-router': - changed-files: - any-glob-to-any-file: 'packages/react-router/**/*' diff --git a/nx.json b/nx.json index 9f9d782278..b7df8b2c09 100644 --- a/nx.json +++ b/nx.json @@ -1,6 +1,7 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", "defaultBase": "main", + "bust": "nx24-exclusive-e2e-16-medium-baseline-2026-10-25-05", "nxCloudId": "6442f7de8226a6291646a813", "useInferencePlugins": false, "parallel": 5, @@ -10,7 +11,10 @@ "namedInputs": { "sharedGlobals": [ "{workspaceRoot}/.npmrc", - "{workspaceRoot}/.nx/workflows/sandboxing-config.yaml", + "{workspaceRoot}/nx.json", + "{workspaceRoot}/.github/workflows/pr.yml", + "{workspaceRoot}/.nx/ci-config.yaml", + "{workspaceRoot}/.nx/workflows/ultracache-config.yaml", "{workspaceRoot}/.nvmrc", "{workspaceRoot}/package.json", "{workspaceRoot}/tsconfig.json" @@ -41,7 +45,7 @@ "targetDefaults": { "test:docs": { "cache": true, - "inputs": ["{workspaceRoot}/docs/**/*"] + "inputs": ["sharedGlobals", "{workspaceRoot}/docs/**/*"] }, "test:eslint": { "cache": true, diff --git a/package.json b/package.json index 5876d0893d..3ef11b1969 100644 --- a/package.json +++ b/package.json @@ -5,17 +5,17 @@ "type": "git", "url": "git+https://github.com/TanStack/router.git" }, - "packageManager": "pnpm@11.21.0", + "packageManager": "pnpm@12.18.0", "engines": { - "pnpm": ">=11.21.0" + "pnpm": ">=12.18.0" }, "type": "module", "scripts": { "cleanNodeModules": "pnpm -r exec rm -rf node_modules", "clean": "pnpm --filter \"./packages/**\" run clean", "test": "pnpm run test:ci", - "test:pr": "nx affected --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build", - "test:ci": "nx run-many --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build", + "test:pr": "nx affected --targets=test:eslint,test:unit,test:integration,test:e2e,test:types,test:build,build", + "test:ci": "nx run-many --targets=test:eslint,test:unit,test:integration,test:e2e,test:types,test:build,build", "test:eslint": "nx affected --target=test:eslint --exclude=examples/**,e2e/**", "test:unit": "nx affected --target=test:unit --exclude=examples/**,e2e/**", "test:unit:dev": "pnpm run test:unit && nx watch --all -- pnpm run test:unit", @@ -65,7 +65,7 @@ "devDependencies": { "@changesets/changelog-github": "^0.7.0", "@changesets/cli": "^2.30.0", - "@nx/devkit": "23.2.0", + "@nx/devkit": "24.0.0", "@playwright/test": "catalog:", "@swc-node/register": "^1.11.1", "@tanstack/eslint-config": "0.4.0", @@ -73,7 +73,7 @@ "eslint": "catalog:", "eslint-plugin-unused-imports": "^4.1.4", "markdown-link-extractor": "^4.0.3", - "nx": "23.2.0", + "nx": "24.0.0", "prettier": "^3.8.0", "tinyglobby": "^0.2.15", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/packages/arktype-adapter/tests/index.test.tsx b/packages/arktype-adapter/tests/index.test.tsx index a99ecda9c4..ce6eb74756 100644 --- a/packages/arktype-adapter/tests/index.test.tsx +++ b/packages/arktype-adapter/tests/index.test.tsx @@ -9,7 +9,6 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, test, vi } from 'vitest' import { type } from 'arktype' import { arkTypeValidator } from '../src' -import '@testing-library/jest-dom/vitest' afterEach(() => { vi.resetAllMocks() diff --git a/packages/arktype-adapter/tests/jest-dom.setup.ts b/packages/arktype-adapter/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/arktype-adapter/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/arktype-adapter/vite.config.ts b/packages/arktype-adapter/vite.config.ts index 8c8c0c519f..8d553e0a59 100644 --- a/packages/arktype-adapter/vite.config.ts +++ b/packages/arktype-adapter/vite.config.ts @@ -9,6 +9,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, }) diff --git a/packages/history/CHANGELOG.md b/packages/history/CHANGELOG.md index ae0e23af42..ca3341088c 100644 --- a/packages/history/CHANGELOG.md +++ b/packages/history/CHANGELOG.md @@ -1,5 +1,19 @@ # @tanstack/history +## 1.162.5 + +### Patch Changes + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Drop a duplicated current-location flag and a redundant `createHref` wrapper. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Avoid temporary arrays when reading hash-history locations. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Keep a leading query or fragment out of the parsed pathname, so hash-history URLs like `/#?x=1` no longer repeat the query in the router location. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Use `slice` instead of `substring` where the bounds are always ordered and non-negative. + ## 1.162.4 ### Patch Changes diff --git a/packages/history/package.json b/packages/history/package.json index 24987d12c7..d09c710d2f 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.162.4", + "version": "1.162.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts index 1c9bd5ed18..d2f80581b9 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -156,27 +156,21 @@ export function createHistory(opts: { else location = opts.getLocation() } - const tryNavigation = async ({ - task, - navigateOpts, - ...actionInfo - }: TryNavigateArgs) => { - const ignoreBlocker = navigateOpts?.ignoreBlocker ?? false - if (ignoreBlocker) { - task() - return - } - - const blockers = opts.getBlockers?.() ?? [] - const isPushOrReplace = - actionInfo.type === 'PUSH' || actionInfo.type === 'REPLACE' - if (typeof document !== 'undefined' && blockers.length && isPushOrReplace) { + const tryNavigation = async (args: TryNavigateArgs) => { + const blockers = args.navigateOpts?.ignoreBlocker + ? undefined + : opts.getBlockers?.() + if ( + typeof document !== 'undefined' && + blockers?.length && + (args.type === 'PUSH' || args.type === 'REPLACE') + ) { for (const blocker of blockers) { - const nextLocation = parseHref(actionInfo.path, actionInfo.state) + const nextLocation = parseHref(args.path, args.state) const isBlocked = await blocker.blockerFn({ currentLocation: location, nextLocation, - action: actionInfo.type, + action: args.type, }) if (isBlocked) { opts.onBlocked?.() @@ -185,7 +179,7 @@ export function createHistory(opts: { } } - task() + args.task() } return { @@ -546,7 +540,7 @@ export function createBrowserHistory(opts?: { } win.history.go(n) }, - createHref: (href) => createHref(href), + createHref, flush, destroy: () => { win.history.pushState = originalPushState @@ -613,14 +607,17 @@ export function createHashHistory(opts?: { window?: any }): RouterHistory { return createBrowserHistory({ window: win, parseLocation: () => { - const hashSplit = win.location.hash.split('#').slice(1) - const pathPart = hashSplit[0] ?? '/' - const searchPart = win.location.search - const hashEntries = hashSplit.slice(1) - const hashPart = - hashEntries.length === 0 ? '' : `#${hashEntries.join('#')}` - const hashHref = `${pathPart}${searchPart}${hashPart}` - return parseHref(hashHref, win.history.state) + // `#/path?query#fragment`: the router's own fragment starts at the + // second '#'. A non-empty `location.hash` always starts with '#'. + const hash = win.location.hash + let hashIndex = hash.indexOf('#', 1) + if (hashIndex < 0) { + hashIndex = hash.length + } + return parseHref( + `${hash ? hash.slice(1, hashIndex) : '/'}${win.location.search}${hash.slice(hashIndex)}`, + win.history.state, + ) }, createHref: (href) => `${win.location.pathname}${win.location.search}#${href}`, @@ -753,17 +750,17 @@ export function parseHref( return { href: sanitizedHref, - pathname: sanitizedHref.substring( + pathname: sanitizedHref.slice( 0, - hashIndex > 0 - ? searchIndex > 0 + hashIndex > -1 + ? searchIndex > -1 ? Math.min(hashIndex, searchIndex) : hashIndex - : searchIndex > 0 + : searchIndex > -1 ? searchIndex : sanitizedHref.length, ), - hash: hashIndex > -1 ? sanitizedHref.substring(hashIndex) : '', + hash: hashIndex > -1 ? sanitizedHref.slice(hashIndex) : '', search: searchIndex > -1 ? sanitizedHref.slice( @@ -777,5 +774,5 @@ export function parseHref( // Thanks co-pilot! function createRandomKey() { - return (Math.random() + 1).toString(36).substring(7) + return (Math.random() + 1).toString(36).slice(7) } diff --git a/packages/history/tests/createHashHistory.test.ts b/packages/history/tests/createHashHistory.test.ts index 621cefe156..e54b1a1ae1 100644 --- a/packages/history/tests/createHashHistory.test.ts +++ b/packages/history/tests/createHashHistory.test.ts @@ -25,6 +25,32 @@ describe('createHashHistory', () => { }, ) + test('reads a hash route that starts with a query without leaking it into the pathname', () => { + const window = { + location: { pathname: '/', search: '', hash: '#?x=1' }, + history: { + state: { __TSR_index: 0, __TSR_key: 'initial' }, + length: 1, + pushState: vi.fn(), + replaceState: vi.fn(), + back: vi.fn(), + forward: vi.fn(), + go: vi.fn(), + }, + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + } + const history = createHashHistory({ window }) + + expect(history.location).toMatchObject({ + href: '?x=1', + pathname: '', + search: '?x=1', + hash: '', + }) + history.destroy() + }) + test('normalizes the final browser href without changing the logical hash location', async () => { const pushState = vi.fn() const window = { @@ -59,6 +85,78 @@ describe('createHashHistory', () => { history.destroy() }) + test.each([ + [ + '/?shell=1#/hello#section#tail', + { + href: '/hello?shell=1#section#tail', + pathname: '/hello', + search: '?shell=1', + hash: '#section#tail', + }, + ], + [ + '/?shell=1#/hello?route=2#section', + { + href: '/hello?route=2?shell=1#section', + pathname: '/hello', + search: '?route=2?shell=1', + hash: '#section', + }, + ], + [ + '/#/hello##tail#', + { + href: '/hello##tail#', + pathname: '/hello', + search: '', + hash: '##tail#', + }, + ], + [ + '/#/hello%23nested?value=%23#anchor%23tail', + { + href: '/hello%23nested?value=%23#anchor%23tail', + pathname: '/hello%23nested', + search: '?value=%23', + hash: '#anchor%23tail', + }, + ], + [ + '/?shell=1#//evil.example/path#fragment', + { + href: '/evil.example/path?shell=1#fragment', + pathname: '/evil.example/path', + search: '?shell=1', + hash: '#fragment', + }, + ], + [ + '/?shell=1#', + { + href: '/?shell=1', + pathname: '/', + search: '?shell=1', + hash: '', + }, + ], + ])('preserves the logical URL when reading %s', (href, expected) => { + const originalHref = window.location.href + const originalState = window.history.state + window.history.replaceState(null, '', href) + const history = createHashHistory() + + try { + expect(history.location).toMatchObject(expected) + window.history.replaceState(window.history.state, '', '/shell') + window.history.pushState(window.history.state, '', href) + expect(history.location).toMatchObject(expected) + } finally { + history.destroy() + window.history.replaceState(originalState, '', originalHref) + } + }) + describe('parseLocation', () => { describe.each([ ['/', { pathname: '/', search: '' }, 'neither search params nor hash'], diff --git a/packages/history/tests/parseHref.test.ts b/packages/history/tests/parseHref.test.ts index 10df49d330..aa6882e6fc 100644 --- a/packages/history/tests/parseHref.test.ts +++ b/packages/history/tests/parseHref.test.ts @@ -21,6 +21,18 @@ describe('parseHref', () => { expect(parsed.hash).toEqual('#qux') }) + test.each([ + ['?x=1', { pathname: '', search: '?x=1', hash: '' }], + ['#top', { pathname: '', search: '', hash: '#top' }], + ['?x=1#top', { pathname: '', search: '?x=1', hash: '#top' }], + ['#top?x=1', { pathname: '', search: '', hash: '#top?x=1' }], + ])( + 'keeps a leading query or fragment out of the pathname: %j', + (href, expected) => { + expect(parseHref(href, undefined)).toMatchObject({ href, ...expected }) + }, + ) + test.each([ { __TSR_index: 2 }, { __TSR_index: 2, key: 'legacy-key', __TSR_key: 'current-key' }, diff --git a/packages/nitro-v2-vite-plugin/CHANGELOG.md b/packages/nitro-v2-vite-plugin/CHANGELOG.md deleted file mode 100644 index 0ac463cae8..0000000000 --- a/packages/nitro-v2-vite-plugin/CHANGELOG.md +++ /dev/null @@ -1,31 +0,0 @@ -# @tanstack/nitro-v2-vite-plugin - -## 1.155.2 - -### Patch Changes - -- [#8300](https://github.com/TanStack/router/pull/8300) [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292) - Refresh compatible build and runtime dependencies. - -## 1.155.1 - -### Patch Changes - -- [#8251](https://github.com/TanStack/router/pull/8251) [`0497cae`](https://github.com/TanStack/router/commit/0497caeef3ff7e1c1c6080eca38bca24e7ec320b) - Use URL.canParse for absolute URL checks in links, navigation, redirects, and build configuration. Preserve a URL constructor fallback for older browsers. - -## 1.155.0 - -### Minor Changes - -- Clean minor bump, fresh start ([#7395](https://github.com/TanStack/router/pull/7395)) - -## 1.154.9 - -### Patch Changes - -- build: update to vite-config 5.x (rolldown) ([#6926](https://github.com/TanStack/router/pull/6926)) - -## 1.154.8 - -### Patch Changes - -- fix: build with @tanstack/vite-config 0.4.3 ([#6923](https://github.com/TanStack/router/pull/6923)) diff --git a/packages/nitro-v2-vite-plugin/README.md b/packages/nitro-v2-vite-plugin/README.md deleted file mode 100644 index 5882e61120..0000000000 --- a/packages/nitro-v2-vite-plugin/README.md +++ /dev/null @@ -1 +0,0 @@ -# Experimental Nitro v2 Vite Plugin diff --git a/packages/nitro-v2-vite-plugin/eslint.config.js b/packages/nitro-v2-vite-plugin/eslint.config.js deleted file mode 100644 index 8ce6ad05fc..0000000000 --- a/packages/nitro-v2-vite-plugin/eslint.config.js +++ /dev/null @@ -1,5 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [...rootConfig] diff --git a/packages/nitro-v2-vite-plugin/package.json b/packages/nitro-v2-vite-plugin/package.json deleted file mode 100644 index 6db01313f2..0000000000 --- a/packages/nitro-v2-vite-plugin/package.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "@tanstack/nitro-v2-vite-plugin", - "version": "1.155.2", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "git+https://github.com/TanStack/router.git", - "directory": "packages/nitro-v2-vite-plugin" - }, - "homepage": "https://tanstack.com/router", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "echo 'No unit tests are needed here since we do them in @tanstack/router-plugin!'", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js", - "test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js", - "test:types:ts60": "tsc6", - "test:types:ts70": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=22.12" - }, - "dependencies": { - "nitropack": "^2.13.4", - "pathe": "catalog:" - }, - "peerDependencies": { - "vite": ">=7.0.0" - }, - "devDependencies": { - "@tanstack/vite-config": "catalog:", - "vitest": "catalog:", - "@arethetypeswrong/cli": "catalog:", - "publint": "catalog:", - "rimraf": "catalog:" - } -} diff --git a/packages/nitro-v2-vite-plugin/src/index.ts b/packages/nitro-v2-vite-plugin/src/index.ts deleted file mode 100644 index 9adf8d8577..0000000000 --- a/packages/nitro-v2-vite-plugin/src/index.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' -import { dirname, resolve } from 'pathe' - -import type { PluginOption, ResolvedConfig, Rollup } from 'vite' -import type { NitroConfig } from 'nitropack' - -let ssrBundle: Rollup.OutputBundle -let ssrEntryFile: string - -export function nitroV2Plugin(nitroConfig?: NitroConfig): Array { - let resolvedConfig: ResolvedConfig - return [ - { - name: 'tanstack-nitro-v2-vite-plugin', - - generateBundle: { - handler(_options, bundle) { - if (this.environment.name !== 'ssr') { - return - } - - // find entry point of ssr bundle - let entryFile: string | undefined - for (const [_name, file] of Object.entries(bundle)) { - if (file.type === 'chunk') { - if (file.isEntry) { - if (entryFile !== undefined) { - this.error( - `Multiple entry points found for service "${this.environment.name}". Only one entry point is allowed.`, - ) - } - entryFile = file.fileName - } - } - } - if (entryFile === undefined) { - this.error( - `No entry point found for service "${this.environment.name}".`, - ) - } - ssrEntryFile = entryFile! - ssrBundle = bundle - }, - }, - - configResolved(config) { - resolvedConfig = config - }, - config(_, env) { - if (env.command !== 'build') { - return - } - - return { - environments: { - ssr: { - consumer: 'server', - build: { - ssr: true, - // we don't write to the file system as the below 'capture-output' plugin will - // capture the output and write it to the virtual file system - write: false, - copyPublicDir: false, - commonjsOptions: { - include: [/node_modules/], - }, - }, - }, - }, - builder: { - sharedPlugins: true, - async buildApp(builder) { - const client = builder.environments.client - const server = builder.environments.ssr - - if (!client) { - throw new Error('Client environment not found') - } - - if (!server) { - throw new Error('SSR environment not found') - } - - await builder.build(client) - await builder.build(server) - - const virtualEntry = '#tanstack/start/entry' - const baseURL = !URL.canParse(resolvedConfig.base) - ? resolvedConfig.base - : undefined - const config: NitroConfig = { - baseURL, - publicAssets: [ - { - dir: client.config.build.outDir, - maxAge: 31536000, // 1 year - baseURL: '/', - }, - ], - ...nitroConfig, - esbuild: { - options: { - target: server.config.build.target || undefined, - ...nitroConfig?.esbuild?.options, - }, - }, - renderer: virtualEntry, - rollupConfig: { - ...nitroConfig?.rollupConfig, - plugins: [virtualBundlePlugin(ssrBundle) as any], - }, - virtual: { - ...nitroConfig?.virtual, - [virtualEntry]: `import { fromWebHandler } from 'h3' - import handler from '${ssrEntryFile}' - export default fromWebHandler(handler.fetch)`, - }, - } - - const nitro = await createNitro(config) - - await prepare(nitro) - await copyPublicAssets(nitro) - await build(nitro) - - await nitro.close() - }, - }, - } - }, - }, - ] -} - -function virtualBundlePlugin(bundle: Rollup.OutputBundle): Rollup.Plugin { - type VirtualModule = { code: string; map: string | null } - let _modules: Map | null = null - - // lazy initialize _modules since at the time of plugin creation, the bundles are not available yet - const getModules = () => { - if (_modules) { - return _modules - } - _modules = new Map() - // group chunks and source maps - for (const [fileName, content] of Object.entries(bundle)) { - if (content.type === 'chunk') { - const virtualModule: VirtualModule = { - code: content.code, - map: null, - } - const maybeMap = bundle[`${fileName}.map`] - if (maybeMap && maybeMap.type === 'asset') { - virtualModule.map = maybeMap.source as string - } - _modules.set(fileName, virtualModule) - _modules.set(resolve(fileName), virtualModule) - } - } - return _modules - } - - return { - name: 'virtual-bundle', - resolveId(id, importer) { - const modules = getModules() - if (modules.has(id)) { - return resolve(id) - } - - if (importer) { - const resolved = resolve(dirname(importer), id) - if (modules.has(resolved)) { - return resolved - } - } - return null - }, - load(id) { - const modules = getModules() - const m = modules.get(id) - if (!m) { - return null - } - return m - }, - } -} diff --git a/packages/nitro-v2-vite-plugin/tsconfig.build.json b/packages/nitro-v2-vite-plugin/tsconfig.build.json deleted file mode 100644 index 92be18587f..0000000000 --- a/packages/nitro-v2-vite-plugin/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "rootDir": "./src" - }, - "include": ["src"] -} diff --git a/packages/nitro-v2-vite-plugin/tsconfig.json b/packages/nitro-v2-vite-plugin/tsconfig.json deleted file mode 100644 index bd398a8728..0000000000 --- a/packages/nitro-v2-vite-plugin/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src", "vite.config.ts", "tests"], - "exclude": ["tests/test-files/**", "tests/snapshots/**"], - "compilerOptions": { - "jsx": "react-jsx" - } -} diff --git a/packages/nitro-v2-vite-plugin/vite.config.ts b/packages/nitro-v2-vite-plugin/vite.config.ts deleted file mode 100644 index 7401092b13..0000000000 --- a/packages/nitro-v2-vite-plugin/vite.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/vite-config' - -const config = defineConfig({}) - -export default mergeConfig( - config, - tanstackViteConfig({ - tsconfigPath: './tsconfig.build.json', - entry: './src/index.ts', - srcDir: './src', - exclude: ['./src/tests/'], - }), -) diff --git a/packages/react-router-devtools/CHANGELOG.md b/packages/react-router-devtools/CHANGELOG.md index 963524b66d..f74de5f187 100644 --- a/packages/react-router-devtools/CHANGELOG.md +++ b/packages/react-router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies [[`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0)]: + - @tanstack/router-devtools-core@1.168.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index fd750b4c2b..969371a6a6 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 0cbde261ce..7e1e2f1a62 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,68 @@ # @tanstack/react-router +## 1.170.46 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- [#8671](https://github.com/TanStack/router/pull/8671) [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398) - Publish the `@tanstack/react-router` agent skills (`react-router`, `compositions/router-query`, `lifecycle/migrate-from-react-router`), which were missing from the package's `files` list. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + +## 1.170.45 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + +## 1.170.44 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + +## 1.170.43 + +### Patch Changes + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + +## 1.170.42 + +### Patch Changes + +- [#8594](https://github.com/TanStack/router/pull/8594) [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb) - reduce component nesting per route match + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8579](https://github.com/TanStack/router/pull/8579) [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b) - Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + +## 1.170.41 + +### Patch Changes + +- [#8529](https://github.com/TanStack/router/pull/8529) [`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74) - Compose only enabled route boundaries instead of rendering inactive wrapper components. + +- [#8568](https://github.com/TanStack/router/pull/8568) [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949) - Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. + +- [#8530](https://github.com/TanStack/router/pull/8530) [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480) - Consolidate the root match context provider while preserving match context in the root shell. + +- [#8522](https://github.com/TanStack/router/pull/8522) [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1) - Reuse Link href classification and active/inactive results across location updates while preserving live history href formatting. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.170.40 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index cb7d24b359..9a61d5af25 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.40", + "version": "1.170.46", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -86,14 +86,16 @@ "sideEffects": false, "files": [ "dist", - "src" + "src", + "skills", + "!skills/_artifacts" ], "engines": { "node": ">=20.19" }, "dependencies": { "@tanstack/history": "workspace:*", - "@tanstack/react-store": "^0.11.0", + "@tanstack/react-store": "^0.11.2", "@tanstack/router-core": "workspace:*", "isbot": "catalog:" }, diff --git a/packages/react-router/skills/compositions/router-query/SKILL.md b/packages/react-router/skills/compositions/router-query/SKILL.md index 9bda851b1c..4fdd74fc30 100644 --- a/packages/react-router/skills/compositions/router-query/SKILL.md +++ b/packages/react-router/skills/compositions/router-query/SKILL.md @@ -2,7 +2,7 @@ name: router-query description: >- Integrating TanStack Router with TanStack Query: queryClient - in router context, ensureQueryData/prefetchQuery in loaders, + in router context, static queries and fire-and-forget queries in loaders, useSuspenseQuery in components, defaultPreloadStaleTime: 0, setupRouterSsrQueryIntegration for SSR dehydration/hydration and streaming, per-request QueryClient isolation. @@ -21,7 +21,7 @@ sources: # TanStack Router + TanStack Query Integration -This skill requires familiarity with both TanStack Router and TanStack Query. Read [router-core](../../../../router-core/skills/router-core/SKILL.md) and [react-router](../../react-router/SKILL.md) first. +This skill requires familiarity with both TanStack Router and TanStack Query. Read `@tanstack/router-core#router-core` and [react-router](../../react-router/SKILL.md) first. This skill covers coordinating TanStack Query as an external data cache with TanStack Router's loader system. The router acts as a **coordinator** — it triggers data fetching during navigation, while Query manages caching, background refetching, and data lifecycle. @@ -182,9 +182,9 @@ export function createAppRouter() { } ``` -## Core Pattern: `ensureQueryData` in Loader + `useSuspenseQuery` in Component +## Core Pattern: Static `query` in Loader + `useSuspenseQuery` in Component -This is the recommended pattern. The loader ensures data is in the cache before render (no loading flash). The component subscribes to the cache for updates. +This is the recommended pattern. The loader queries data before render (no loading flash), using `staleTime: 'static'` to reuse cached data without a stale refetch. The component subscribes to the cache for updates. ```tsx // src/routes/posts.tsx @@ -204,9 +204,12 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ loader: ({ context }) => { - // ensureQueryData returns cached data if available, fetches if not in cache - // To also refetch stale data, pass revalidateIfStale: true - return context.queryClient.ensureQueryData(postsQueryOptions) + // query returns cached data when available and fetches when it is missing + // Keep this query static so a stale refetch does not block navigation + return context.queryClient.query({ + ...postsQueryOptions, + staleTime: 'static', + }) }, component: PostsPage, }) @@ -246,7 +249,10 @@ const postQueryOptions = (postId: string) => export const Route = createFileRoute('/posts/$postId')({ loader: ({ context, params }) => { - return context.queryClient.ensureQueryData(postQueryOptions(params.postId)) + return context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', + }) }, component: PostPage, }) @@ -259,20 +265,23 @@ function PostPage() { } ``` -## Streaming Pattern: `prefetchQuery` (Not Awaited) +## Streaming Pattern: Fire-and-Forget `query` (Not Awaited) -For non-critical data, start the fetch without blocking navigation: +For non-critical data, start a query without blocking navigation. Handle its rejection with `noop` so a background failure does not become an unhandled rejection: ```tsx -import { useQuery, useSuspenseQuery } from '@tanstack/react-query' +import { noop, useQuery, useSuspenseQuery } from '@tanstack/react-query' export const Route = createFileRoute('/dashboard')({ loader: ({ context }) => { // Await critical data - const user = context.queryClient.ensureQueryData(userQueryOptions) + const user = context.queryClient.query({ + ...userQueryOptions, + staleTime: 'static', + }) - // Start non-critical fetch without awaiting — streams during SSR - context.queryClient.prefetchQuery(analyticsQueryOptions) + // Start non-critical query without awaiting — streams during SSR + void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) return user }, @@ -304,7 +313,10 @@ import { useRouter } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: ({ context }) => - context.queryClient.ensureQueryData(postsQueryOptions), + context.queryClient.query({ + ...postsQueryOptions, + staleTime: 'static', + }), errorComponent: PostsErrorComponent, component: PostsPage, }) @@ -373,24 +385,29 @@ export function createAppRouter() { } ``` -### 3. MEDIUM: Awaiting `prefetchQuery` in loader blocks rendering +### 3. MEDIUM: Awaiting a fire-and-forget query in a loader blocks rendering -`prefetchQuery` is designed to fire-and-forget. Awaiting it blocks the navigation transition until the data resolves, defeating the purpose of streaming. +A query used for streaming should start in the background and handle errors with `catch(noop)`. Awaiting it blocks the navigation transition until the data resolves, defeating the purpose of streaming. ```tsx +import { noop } from '@tanstack/react-query' + // WRONG — blocks navigation, no streaming benefit loader: async ({ context }) => { - await context.queryClient.prefetchQuery(analyticsQueryOptions) + await context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) } -// CORRECT — fire and forget for streaming +// CORRECT — fire and forget for streaming, with handled rejection loader: ({ context }) => { - context.queryClient.prefetchQuery(analyticsQueryOptions) + void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) } -// If you need to block (critical data), use ensureQueryData instead: +// If you need to block (critical data), use a static query instead: loader: ({ context }) => { - return context.queryClient.ensureQueryData(criticalQueryOptions) + return context.queryClient.query({ + ...criticalQueryOptions, + staleTime: 'static', + }) } ``` @@ -415,10 +432,10 @@ const rootRoute = createRootRouteWithContext<{ queryClient: QueryClient }>()({ TanStack Router has its own SWR cache (`staleTime`, `gcTime`, `defaultPreloadStaleTime`). When using Query as an external cache: - Set `defaultPreloadStaleTime: 0` to prevent Router's cache from short-circuiting Query's freshness logic -- Router's `staleTime`/`gcTime` still apply to the loader return value. For pure Query patterns, return nothing from the loader (just `ensureQueryData` for the side effect) and read data exclusively from `useSuspenseQuery` -- `router.invalidate()` re-runs loaders (which call `ensureQueryData`), but Query decides whether to actually refetch based on its own `staleTime` +- Router's `staleTime`/`gcTime` still apply to the loader return value. For pure Query patterns, return nothing from the loader (just a static `query` for the side effect) and read data exclusively from `useSuspenseQuery` +- `router.invalidate()` re-runs loaders (which call `query` with `staleTime: 'static'`), so the cached Query data remains the freshness authority ## Cross-References -- [router-core/data-loading](../../../../router-core/skills/router-core/data-loading/SKILL.md) — built-in loader caching fundamentals -- [router-core/ssr](../../../../router-core/skills/router-core/ssr/SKILL.md) — SSR setup for dehydration/hydration +- `@tanstack/router-core#router-core/data-loading` — built-in loader caching fundamentals +- `@tanstack/router-core#router-core/ssr` — SSR setup for dehydration/hydration diff --git a/packages/react-router/skills/react-router/SKILL.md b/packages/react-router/skills/react-router/SKILL.md index ba628f7003..f8df76df02 100644 --- a/packages/react-router/skills/react-router/SKILL.md +++ b/packages/react-router/skills/react-router/SKILL.md @@ -23,7 +23,7 @@ sources: # React Router (`@tanstack/react-router`) -This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) first for foundational concepts. +This skill builds on router-core. Read `@tanstack/router-core#router-core` first for foundational concepts. > **CRITICAL**: TanStack Router types are FULLY INFERRED. Never cast, never annotate inferred values. > **CRITICAL**: TanStack Router is CLIENT-FIRST. Loaders run on the client by default, not on the server. @@ -495,4 +495,4 @@ function App() { ## Cross-References -- [router-core/SKILL.md](../../../router-core/skills/router-core/SKILL.md) — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 1ba756053a..db1d341ec4 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -8,7 +8,6 @@ import { CatchBoundary, ErrorComponent } from './CatchBoundary' import { useRouter } from './useRouter' import { CatchNotFound } from './not-found' import { matchContext } from './matchContext' -import { SafeFragment } from './SafeFragment' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' import { ClientOnly } from './ClientOnly' @@ -69,22 +68,16 @@ export const Match = React.memo(function MatchImpl({ if (isServer ?? router.isServer) { const match = router.stores.byRoute.get(routeId)!.get()! - return + return matchView(router, match) } const matchStore = router.stores.getMatchStore(routeId) // eslint-disable-next-line react-hooks/rules-of-hooks - const match = useSelector(matchStore) - return + const match = useSelector(matchStore)! + return matchView(router, match) }) -function MatchView({ - router, - match, -}: { - router: ReturnType - match: AnyRouteMatch -}) { +function matchView(router: ReturnType, match: AnyRouteMatch) { const route: AnyRoute = router.routesById[match.routeId] const pendingElement = renderPending(router, route) @@ -103,81 +96,90 @@ function MatchView({ const resolvedNoSsr = match.ssr === false || match.ssr === 'data-only' // A root component may render the document itself. Only place its Suspense // boundary in pure CSR, inside an explicit shell, or when explicitly opted in. - const ResolvedSuspenseBoundary = + const wrapInSuspense = canWrapInSuspense(router, route, match.ssr) && (route.options.wrapInSuspense ?? pendingElement ?? ((route.options.errorComponent as any)?.preload || resolvedNoSsr)) - ? React.Suspense - : SafeFragment - const ResolvedCatchBoundary = routeErrorComponent - ? CatchBoundary - : SafeFragment + let content = + if (resolvedNoSsr) { + content = {content} + } + if (routeNotFoundComponent) { + content = ( + { + error.routeId ??= match.routeId + if (error.routeId !== match.routeId) { + throw error + } + const notFoundElement = React.createElement( + routeNotFoundComponent, + error as any, + ) + return process.env.NODE_ENV !== 'production' + ? wrapInNonRouteComponentContext( + notFoundElement, + 'notFoundComponent', + ) + : notFoundElement + }} + > + {content} + + ) + } + if (routeErrorComponent) { + content = ( + match} + errorComponent={routeErrorComponent as any} + onCatch={(error, errorInfo) => { + // Not-found errors belong to the enclosing not-found boundary. + if (isNotFound(error)) { + error.routeId ??= match.routeId + throw error + } + if (process.env.NODE_ENV !== 'production') { + console.warn(`Warning: Error in route match: ${match.id}`) + } + routeOnCatch?.(error, errorInfo) + }} + > + {content} + + ) + } + if (wrapInSuspense) { + content = ( + {content} + ) + } - const ResolvedNotFoundBoundary = routeNotFoundComponent - ? CatchNotFound - : SafeFragment + const scrollRestoration = + (isServer ?? router.isServer) && + route.parentRoute?.id === rootRouteId && + router.options.scrollRestoration ? ( + + ) : null - const ShellComponent = route.isRoot - ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment) - : SafeFragment - return ( - - - - match} - errorComponent={routeErrorComponent as any} - onCatch={(error, errorInfo) => { - // Forward not found errors (we don't want to show the error component for these) - if (isNotFound(error)) { - error.routeId ??= match.routeId - throw error - } - if (process.env.NODE_ENV !== 'production') { - console.warn(`Warning: Error in route match: ${match.id}`) - } - routeOnCatch?.(error, errorInfo) - }} - > - { - error.routeId ??= match.routeId + const ShellComponent = + route.isRoot && (route.options as RootRouteOptions).shellComponent - if (error.routeId !== match.routeId) { - throw error - } - - const notFoundElement = React.createElement( - routeNotFoundComponent!, - error as any, - ) - return process.env.NODE_ENV !== 'production' - ? wrapInNonRouteComponentContext( - notFoundElement, - 'notFoundComponent', - ) - : notFoundElement - }} - > - {resolvedNoSsr ? ( - - - - ) : ( - - )} - - - - - {(isServer ?? router.isServer) && - route.parentRoute?.id === rootRouteId && - router.options.scrollRestoration ? ( - - ) : null} - + return ShellComponent ? ( + // The shell and route boundaries must share this match's context. + + + {content} + {scrollRestoration} + + + ) : ( + + {content} + {scrollRestoration} + ) } diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index 6dea1032f2..a20c862b23 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -11,7 +11,6 @@ import { useLayoutEffect } from './utils' import { Transitioner, settleOwner } from './Transitioner' import { matchContext } from './matchContext' import { Match, renderPending } from './Match' -import { SafeFragment } from './SafeFragment' import type { StructuralSharingOption, ValidateSelected, @@ -51,10 +50,6 @@ export function Matches() { const pendingElement = renderPending(router, rootRoute) - // Do not render a root Suspense during SSR or hydrating from SSR - const ResolvedSuspense = - (isServer ?? router.isServer) || router.ssr ? SafeFragment : React.Suspense - const inner = ( <> {!(isServer ?? router.isServer) && ( @@ -67,9 +62,13 @@ export function Matches() { t={React.useState()[1]} /> )} - + {(isServer ?? router.isServer) || router.ssr ? ( - + ) : ( + + + + )} ) @@ -102,28 +101,24 @@ function MatchesInner() { const matchComponent = routeId ? : null - return ( - - {router.options.disableGlobalCatchBoundary ? ( - matchComponent - ) : ( - match} - onCatch={ - process.env.NODE_ENV !== 'production' - ? (error) => { - console.warn( - `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`, - ) - console.warn('Warning:', error) - } - : undefined - } - > - {matchComponent} - - )} - + return router.options.disableGlobalCatchBoundary ? ( + matchComponent + ) : ( + match} + onCatch={ + process.env.NODE_ENV !== 'production' + ? (error) => { + console.warn( + `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`, + ) + console.warn('Warning:', error) + } + : undefined + } + > + {matchComponent} + ) } diff --git a/packages/react-router/src/SafeFragment.tsx b/packages/react-router/src/SafeFragment.tsx deleted file mode 100644 index 72a95bac01..0000000000 --- a/packages/react-router/src/SafeFragment.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as React from 'react' - -export function SafeFragment(props: any) { - return <>{props.children} -} diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index aa958ef31c..ce6a7ed9d1 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -1,7 +1,6 @@ 'use client' import * as React from 'react' -import { useSelector } from '@tanstack/react-store' import { deepEqual, functionalUpdate, @@ -12,8 +11,8 @@ import { } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' +import { createLinkScope, matchContext } from './matchContext' -import { useHydrated } from './ClientOnly' import type { ActiveOptions, AnyRouter, @@ -35,8 +34,8 @@ type LinkState = [href: string | undefined, isActive?: boolean] // Keep referentially stable values while their contents are equal. Links // routinely pass inline `params` / `search` object literals, which would -// otherwise change `_options` identity on every parent render, rebuild the -// store selector, and discard its memoized selection. One ref holds all of +// otherwise change `dest` identity on every parent render, rebuild the +// link state snapshot, and discard its memoized state. One ref holds all of // them; each entry is replaced only when its own contents change. // // The router reuses a built location for as long as it sees the same options @@ -66,10 +65,6 @@ function preloadLink(router: AnyRouter, options: unknown) { }) } -const LINK_SELECTOR_OPTIONS = { - compare: (a: LinkState, b: LinkState) => a[0] === b[0] && a[1] === b[1], -} - function resolveExternalLink( to: string | undefined, protocolAllowlist: AnyRouter['protocolAllowlist'], @@ -92,7 +87,6 @@ function resolveIsActive( next: ParsedLocation, activeOptions: ActiveOptions | undefined, basepath: string, - isHydrated: boolean, ): boolean { const currentPath = removeTrailingSlash(location.pathname, basepath) const nextPath = removeTrailingSlash(next.pathname, basepath) @@ -122,10 +116,7 @@ function resolveIsActive( } } - if (activeOptions?.includeHash) { - return isHydrated && location.hash === next.hash - } - return true + return !activeOptions?.includeHash || location.hash === next.hash } /** @@ -213,13 +204,13 @@ export function useLinkProps< // 3. In client bundles, `isServer` is `false`, so the early return never executes // ========================================================================== - // The link's own ref: the element for the viewport observer and the key + // The link's own ref: the element for the viewport observer and the holder // of a pending intent timer. A forwarded ref is filled alongside it by one // callback, memoized on the forwarded ref so React re-attaches it (and // notifies the consumer) only when their ref changes, not on every render. // A cleanup returned by a consumer callback is passed through to React. // eslint-disable-next-line react-hooks/rules-of-hooks - const innerRef = React.useRef(null) + const innerRef: LinkRef = React.useRef(null) // eslint-disable-next-line react-hooks/rules-of-hooks const mergedRef = React.useCallback( (element: Element | null) => { @@ -240,12 +231,6 @@ export function useLinkProps< to, preload: userPreload, preloadDelay: userPreloadDelay, - hashScrollIntoView, - replace, - startTransition, - resetScroll, - viewTransition, - ignoreBlocker, disabled, target, onClick, @@ -256,83 +241,111 @@ export function useLinkProps< onTouchStart, } = options as typeof options & { to?: string } - // eslint-disable-next-line react-hooks/rules-of-hooks - const isHydrated = useHydrated(!!activeOptions?.includeHash) - // eslint-disable-next-line react-hooks/rules-of-hooks const [stableSearch, stableParams, stableActiveOptions] = useStableValues( options.search, options.params, activeOptions, ) - // `_options` is the options object from the render that last changed the - // destination. `dest` is its copy that the link owns: one stable object per - // link lets the router reuse location-independent results. + // The links of a route share its location source. Links outside every + // match share one that never departs. // eslint-disable-next-line react-hooks/rules-of-hooks - const [_options, dest] = React.useMemo( - () => [options, { ...options } as any] as const, - // eslint-disable-next-line react-hooks/exhaustive-deps - [ - router, - options.from, - options._fromLocation, - options.hash, - options.to, - stableSearch, - stableParams, - options.state, - options.mask, - options.unsafeRelative, - ], - ) + const routeId = React.useContext(matchContext) + const scope = ((router.stores._linkScopes ??= {})[routeId!] ??= + createLinkScope(router, routeId)) - // Derive inside the selector so `compareLinkState` can bail out. Deriving after - // the subscription instead re-renders every link on every navigation, because - // the comparator only sees the location, not whether this link's output moved. + // `dest` is the link's own copy of the options from the render that last + // changed the link: one stable object per link lets the router reuse + // location-independent results. It also carries the location the link + // displays, so clicks and preloads go where its href points. + // The snapshot depends only on the scope's location: it derives once per + // location so React can bail out on an unchanged state, and derives eagerly + // inside the scope's notification. // eslint-disable-next-line react-hooks/rules-of-hooks - const selectLinkState = React.useCallback( - (location: ParsedLocation): LinkState => { - const directExternalLink = resolveExternalLink( - to, - router.protocolAllowlist, - ) - if (directExternalLink !== undefined) { - return [directExternalLink ?? undefined] - } + const [dest, getLinkState, getHydrationState] = React.useMemo(() => { + // Direct destinations and the router's allowlist are stable for this snapshot. + const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) + if (directExternalLink !== undefined) { + const state: LinkState = [directExternalLink ?? undefined] + return [options, () => state] as const + } - if (!_options._fromLocation) { + const dest = { ...options } as any + let source: ParsedLocation | undefined + let state: LinkState + let hydrationState: LinkState | undefined + + const getLinkState = (): LinkState => { + // Read the location once and record it only after deriving: a + // derivation that throws is retried instead of caching its state. + const location = scope[0 /* getSource */]() + if (location !== source) { dest._fromLocation = location - } - const next = router.buildLocation(dest) + const next = router.buildLocation(dest) - // Use publicHref - it contains the correct href for display - // When a rewrite changes the origin, publicHref is the full URL - // Otherwise it's the origin-stripped path - // This avoids constructing URL objects in the hot path - const hrefOption = getHrefOption(next, router, disabled) - return [ - hrefOption, - !disabled && (!hrefOption || getUrlScheme(hrefOption)) - ? undefined - : resolveIsActive( - location, - next, - stableActiveOptions, - router.basepath, - isHydrated, - ), - ] - }, - [stableActiveOptions, disabled, isHydrated, _options, dest, router, to], - ) + // History formatters can depend on the current browser URL (hash history). + const href = getHrefOption(next, router, disabled) + // Internal and disabled links can be active; external and blocked + // links have no active state. + const isActive = + disabled || (href && !getUrlScheme(href)) + ? resolveIsActive( + location, + next, + stableActiveOptions, + router.basepath, + ) + : undefined + // Keep the state while it is equal so React can bail out. + if ( + !state || + state[0 /* href */] !== href || + state[1 /* isActive */] !== isActive + ) { + state = [href, isActive] + } + source = location + } + return state + } + + return [ + dest, + getLinkState, + // Hydration renders the server's markup, which has no hash, so an active + // hash-sensitive link hydrates inactive and React rerenders it after. + stableActiveOptions?.includeHash && + ((): LinkState => { + const state = getLinkState() + return state[1 /* isActive */] + ? (hydrationState ??= [state[0 /* href */], false]) + : state + }), + ] as const + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [ + router, + scope, + options.from, + options.hash, + options.href, + to, + stableSearch, + stableParams, + options.state, + options.mask, + options.unsafeRelative, + stableActiveOptions, + disabled, + ]) // eslint-disable-next-line react-hooks/rules-of-hooks - const [href, isActive] = useSelector( - router.stores.location, - selectLinkState, - LINK_SELECTOR_OPTIONS, + const [href, isActive] = React.useSyncExternalStore( + scope[1 /* subscribe */], + getLinkState, + getHydrationState || getLinkState, ) - const externalLink = isActive === undefined ? href : undefined + const externalLink = isActive === undefined && href const linkDisabled = disabled || href === undefined // eslint-disable-next-line react-hooks/rules-of-hooks @@ -346,7 +359,7 @@ export function useLinkProps< userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0 // `preloadRoute` builds the location itself and only reads the options, so - // `_options` goes through as-is. + // `dest` goes through as-is. // eslint-disable-next-line react-hooks/rules-of-hooks const enqueuePreload = React.useCallback( (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => { @@ -360,23 +373,16 @@ export function useLinkProps< } if (!preloadDelay) { - preloadLink(router, _options) + preloadLink(router, dest) return } - if (timeoutMap.has(innerRef)) { - return - } - - timeoutMap.set( - innerRef, - setTimeout(() => { - timeoutMap.delete(innerRef) - preloadLink(router, _options) - }, preloadDelay), - ) + innerRef.t ??= setTimeout(() => { + innerRef.t = undefined + preloadLink(router, dest) + }, preloadDelay) }, - [router, _options, innerRef, preload, preloadDelay], + [router, dest, innerRef, preload, preloadDelay], ) // Preload side effects: `render` preloads once per link, `viewport` watches @@ -389,7 +395,7 @@ export function useLinkProps< } if (preload === 'render' && !hasRenderFetched.current) { hasRenderFetched.current = true - preloadLink(router, _options) + preloadLink(router, dest) } let active = true let observer: IntersectionObserver | undefined @@ -414,7 +420,7 @@ export function useLinkProps< observer?.disconnect() cancelPreload(innerRef) } - }, [router, _options, preload, enqueuePreload, innerRef]) + }, [router, dest, preload, enqueuePreload, innerRef]) const props = collectElementProps(options, host) props.ref = forwardedRef ? mergedRef : innerRef @@ -441,24 +447,18 @@ export function useLinkProps< e.button === 0 ) { e.preventDefault() + cancelPreload(innerRef) - // All is well? Navigate! - // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing - router.navigate({ - ..._options, - replace, - resetScroll, - hashScrollIntoView, - startTransition, - viewTransition, - ignoreBlocker, - }) + // The current options carry the navigation controls; `dest` only + // contributes the location the link displays. Navigation builds again + // to run `validateSearch` before committing. + router.navigate({ ...options, _fromLocation: dest._fromLocation }) } } const handleTouchStart = () => { if (preload === 'intent') { - preloadLink(router, _options) + preloadLink(router, dest) } } @@ -490,7 +490,6 @@ const ROUTER_OPTION_KEYS = /* @__PURE__ */ new Set([ 'mask', 'from', 'unsafeRelative', - '_fromLocation', 'reloadDocument', 'preload', 'preloadDelay', @@ -620,16 +619,16 @@ function getServerLinkProps( } const blockedLink = !disabled && !hrefOption - // Hash is not available on the server, so it never counts as hydrated. + // Hash is not available on the server: hash-sensitive links are inactive. const isActive = !!next && !blockedLink && + !activeOptions?.includeHash && resolveIsActive( router.stores.location.get(), next, activeOptions, router.basepath, - false, ) return applyLinkState( props, @@ -641,10 +640,13 @@ function getServerLinkProps( ) } -const timeoutMap = new WeakMap>() -const cancelPreload = (eventTarget: object) => { - clearTimeout(timeoutMap.get(eventTarget)) - timeoutMap.delete(eventTarget) +// A Link's own ref also holds its pending intent preload timer. +type LinkRef = React.RefObject & { + t?: ReturnType +} +const cancelPreload = (ref: LinkRef) => { + clearTimeout(ref.t) + ref.t = undefined } export const composeHandlers = ( @@ -859,8 +861,8 @@ export const Link: LinkComponent<'a'> = React.memo( areLinkPropsEqual, ) as any -// A Link's output depends only on its props, the router context and the -// location store, which React tracks for memoized components, so a parent +// A Link's output depends only on its props, the router context and its +// route's location source, which React tracks for memoized components, so a parent // re-render with equal props can skip it. Router options are compared by // value: destinations are usually inline object literals. Element props // (`children`, handlers, `style`, ...) are compared by reference only, since diff --git a/packages/react-router/src/matchContext.tsx b/packages/react-router/src/matchContext.tsx index a7030847e1..12db4dbada 100644 --- a/packages/react-router/src/matchContext.tsx +++ b/packages/react-router/src/matchContext.tsx @@ -1,6 +1,70 @@ 'use client' import * as React from 'react' +import { _isRouteDeparting } from '@tanstack/router-core' +import type { AnyRoute, AnyRouter, ParsedLocation } from '@tanstack/router-core' + +declare module '@tanstack/router-core' { + // Declaration merging requires the original type parameters. + // eslint-disable-next-line unused-imports/no-unused-vars + interface RouterStores { + /** + * The link scope of each route id that rendered links, keyed `undefined` + * for links outside every match (route ids start with `/` or are the + * root id). A scope without links holds no location. + */ + _linkScopes?: Record + } +} + +/** + * The location source shared by the links of one route. It holds one location + * subscription for all of them while any is subscribed, and skips a + * publication whose navigation removes the route: those links keep the + * location their route still presents until it unmounts or a newer + * publication keeps it. Without subscribers it holds nothing and reads the + * live location. + */ +export type LinkScope = [ + getSource: () => ParsedLocation, + subscribe: (listener: () => void) => () => void, +] + +export function createLinkScope( + router: AnyRouter, + routeId?: string, +): LinkScope { + // Stores are created once per router. + const store = router.stores.location + const listeners = new Set<() => void>() + let source: ParsedLocation | undefined + let unsubscribe: () => void + // Defined outside `subscribe` so the store's subscription does not share a + // closure with, and retain, the first listener after it unsubscribes. + const update = (location: ParsedLocation) => { + if (!_isRouteDeparting(router, routeId, location)) { + source = location + listeners.forEach((listener) => listener()) + } + } + return [ + () => source ?? store.get(), + (listener) => { + if (!listeners.size) { + source = store.get() + unsubscribe = store.subscribe(update).unsubscribe + } + listeners.add(listener) + return () => { + listeners.delete(listener) + if (!listeners.size) { + unsubscribe() + source = undefined + } + } + }, + ] +} export const matchContext = React.createContext(undefined) diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx index 893cef01bc..976410cba5 100644 --- a/packages/react-router/tests/Scripts.test.tsx +++ b/packages/react-router/tests/Scripts.test.tsx @@ -547,6 +547,35 @@ describe('ssr HeadContent', () => { ) }) + test('renders manifest module preloads with low fetch priority', async () => { + const preloadHref = '/low-priority-module.js' + const rootRoute = createRootRoute({ + component: () => , + }) + const indexRoute = createRoute({ + path: '/', + getParentRoute: () => rootRoute, + }) + const router = createRouter({ + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: rootRoute.addChildren([indexRoute]), + isServer: true, + }) + + router.ssr = { + manifest: createTestManifest(rootRoute.id, { preloadHref }), + } + + await router.load() + + const html = ReactDOMServer.renderToString( + , + ) + expect(html).toContain( + ``, + ) + }) + test('keeps manifest stylesheet links mounted when history state changes', async () => { const history = createTestBrowserHistory() const stylesheetHref = '/history-state.css' @@ -745,7 +774,7 @@ describe('ssr HeadContent', () => { ).toBe('.runtime{color:red}') }) - test('renders preload as script links for iife manifest preloads', async () => { + test('renders iife manifest preloads as low priority script links', async () => { const history = createTestBrowserHistory() const preloadHref = '/iife-preload.js' @@ -795,6 +824,13 @@ describe('ssr HeadContent', () => { `link[rel="modulepreload"][href="${preloadHref}"]`, ), ).toBeFalsy() + expect( + document.head + .querySelector( + `link[rel="preload"][as="script"][href="${preloadHref}"]`, + ) + ?.getAttribute('fetchpriority'), + ).toBe('low') }) test('assetCrossOrigin overrides manifest crossOrigin values', async () => { diff --git a/packages/react-router/tests/blocker.test.tsx b/packages/react-router/tests/blocker.test.tsx index 60d1e8a821..3ed3c3039e 100644 --- a/packages/react-router/tests/blocker.test.tsx +++ b/packages/react-router/tests/blocker.test.tsx @@ -1,5 +1,4 @@ import React from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import combinate from 'combinate' diff --git a/packages/react-router/tests/jest-dom.setup.ts b/packages/react-router/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/react-router/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/react-router/tests/link-departing-scope.test.tsx b/packages/react-router/tests/link-departing-scope.test.tsx new file mode 100644 index 0000000000..04d0c3f32d --- /dev/null +++ b/packages/react-router/tests/link-departing-scope.test.tsx @@ -0,0 +1,1122 @@ +import { setFlagsFromString } from 'node:v8' +import { runInNewContext } from 'node:vm' +import React from 'react' +import { + act, + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@testing-library/react' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouteMask, + createRouter, + redirect, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +type Deferred = { + promise: Promise + resolve: () => void +} + +function deferred(): Deferred { + let resolve!: () => void + const promise = new Promise((r) => (resolve = r)) + return { promise, resolve } +} + +type Gates = Partial> + +function setup({ + initial = '/a', + strict = false, + bAfterGate, + beforeRender, +}: { + initial?: string + strict?: boolean + bAfterGate?: () => void + beforeRender?: (router: any) => void +} = {}) { + const gates: Gates = {} + const counts = { + aUpdater: 0, + aRenders: 0, + goneUpdater: 0, + suspendedUpdater: 0, + } + // The `x` dependency of every `/a` load, preloads included. + const aLoads: Array = [] + // The `x` of every location the `a-next` link derives from. + const nextFrom: Array = [] + const controls: { + setHash?: (hash: string | undefined) => void + setExtra?: (extra: boolean) => void + setGone?: (gone: boolean) => void + setRenderPreload?: (renderPreload: boolean) => void + } = {} + let suspendGate: Deferred | undefined + + function Suspender() { + if (suspendGate) { + throw suspendGate.promise + } + return null + } + + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const layout = createRoute({ + getParentRoute: () => root, + id: '_layout', + component: () => ( + <> + + layout b + + + + ), + }) + function AComponent() { + const [hash, setHash] = React.useState(undefined) + const [extra, setExtra] = React.useState(false) + const [gone, setGone] = React.useState(false) + const [renderPreload, setRenderPreload] = React.useState(false) + controls.setHash = setHash + controls.setExtra = setExtra + controls.setGone = setGone + controls.setRenderPreload = setRenderPreload + return ( + <> +

A page

+ { + counts.aUpdater++ + return prev + }} + > + {() => { + counts.aRenders++ + return 'a self' + }} + + + a dot + + { + nextFrom.push(prev.x) + return { x: `${prev.x}-next` } + }} + preload="intent" + preloadDelay={0} + data-testid="a-next" + > + a next + + {renderPreload ? ( + ({ x: `${prev.x}-render` })} + preload="render" + data-testid="a-render" + > + a render + + ) : null} + {extra ? ( + prev} data-testid="a-extra"> + a extra + + ) : null} + {gone ? null : ( + { + counts.goneUpdater++ + return prev + }} + > + a gone + + )} + suspended}> + { + counts.suspendedUpdater++ + return prev + }} + > + a suspended + + + + + ) + } + const a = createRoute({ + getParentRoute: () => layout, + path: '/a', + loaderDeps: ({ search }: { search: any }) => ({ x: search.x }), + loader: ({ deps }: { deps: { x: unknown } }) => { + aLoads.push(deps.x) + return gates.a?.promise + }, + component: AComponent, + }) + const b = createRoute({ + getParentRoute: () => layout, + path: '/b', + loader: async () => { + await gates.b?.promise + bAfterGate?.() + }, + component: () =>

B page

, + }) + const c = createRoute({ + getParentRoute: () => root, + path: '/c', + component: () =>

C page

, + }) + const items = createRoute({ + getParentRoute: () => root, + path: '/items/$id', + loader: () => gates.items?.promise, + component: () => ( + <> +

Items page

+ + item 1 + + + item 2 + + + ), + }) + + const router = createRouter({ + routeTree: root.addChildren([layout.addChildren([a, b]), c, items]), + history: createMemoryHistory({ initialEntries: [initial] }), + }) + + beforeRender?.(router) + const app = + render(strict ? {app} : app) + + const link = (id: string) => screen.getByTestId(id) + const isActive = (id: string) => + link(id).getAttribute('aria-current') === 'page' + const href = (id: string) => link(id).getAttribute('href') + + async function start(options: any) { + await act(async () => { + void router.navigate(options) + await Promise.resolve() + }) + } + + async function settle() { + await waitFor(() => expect(router.state.status).toBe('idle')) + } + + async function release(name: keyof Gates) { + const gate = gates[name]! + gates[name] = undefined + await act(async () => { + gate.resolve() + await gate.promise + }) + } + + return { + router, + gates, + counts, + aLoads, + nextFrom, + controls, + link, + isActive, + href, + start, + settle, + release, + setSuspendGate: (gate: Deferred | undefined) => (suspendGate = gate), + } +} + +describe('links in a departing match', () => { + test('skip work at navigation start while staying links update urgently', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + expect(t.isActive('layout-b')).toBe(false) + + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + // Staying root and layout links update while the loader is pending. + expect(t.isActive('root-b')).toBe(true) + expect(t.isActive('layout-b')).toBe(true) + // The departing route's links do no work. + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('root-b')).toBe(true) + expect(t.router.state.status).toBe('idle') + }) + + test('staying route with changed params updates its links while pending', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + expect(t.isActive('item-1')).toBe(true) + expect(t.isActive('item-2')).toBe(false) + + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '2' } }) + expect(t.router.state.status).toBe('pending') + expect(t.isActive('item-1')).toBe(false) + expect(t.isActive('item-2')).toBe(true) + + await t.release('items') + expect(t.router.state.status).toBe('idle') + expect(t.isActive('item-2')).toBe(true) + }) + + test('a pending departure redirected back to the owner ends consistent', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/a', search: { x: 'back' } } as any) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-self')).toBe('/a') + + await t.release('b') + expect(t.router.state.status).toBe('idle') + expect(t.router.state.location.href).toBe('/a?x=back') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=back') + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-dot')).toBe('/a') + expect(t.isActive('root-b')).toBe(false) + }) + + test('a pending departure superseded by a location that keeps the owner ends consistent', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + const updater = t.counts.aUpdater + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.counts.aUpdater).toBeGreaterThan(updater) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.status).toBe('idle') + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('links mounting or changing in a departing match build from its held location', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.href('a-dot')).toBe('/a') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + act(() => { + t.controls.setHash!('h') + t.controls.setExtra!(true) + }) + // Both build from the location the rest of the match still presents. + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a') + expect(t.isActive('a-self')).toBe(true) + + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + t.gates.b.resolve() + await t.settle() + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.isActive('a-extra')).toBe(true) + }) + + test('a pending navigation within the owner, then a departure, then back', async () => { + const t = setup() + await screen.findByText('A page') + + t.gates.a = deferred() + const firstA = t.gates.a + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.router.state.status).toBe('pending') + // Staying: updates while the owner's own loader is pending. + expect(t.href('a-self')).toBe('/a?x=one') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('root-b')).toBe(true) + + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('root-b')).toBe(false) + + firstA.resolve() + t.gates.b.resolve() + await t.settle() + expect(t.router.state.status).toBe('idle') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('a departing link unmounted while pending does no further work', async () => { + const error = vi.spyOn(console, 'error') + const warn = vi.spyOn(console, 'warn') + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const gone = t.counts.goneUpdater + await t.start({ to: '/b' }) + act(() => { + t.controls.setGone!(true) + }) + expect(screen.queryByTestId('a-gone')).toBeNull() + await t.release('b') + await screen.findByText('B page') + expect(t.counts.goneUpdater).toBe(gone) + expect(error).not.toHaveBeenCalled() + expect(warn).not.toHaveBeenCalled() + }) + + test('an abandoned suspended link render keeps links consistent', async () => { + const t = setup() + await screen.findByText('A page') + const gate = deferred() + t.setSuspendGate(gate) + // Re-render A so the boundary suspends with its link rendered but not committed. + act(() => { + t.controls.setHash!('s') + }) + t.setSuspendGate(undefined) + await act(async () => { + gate.resolve() + await gate.promise + }) + expect(t.href('a-suspended')).toBe('/a') + + await t.start({ to: '/a', search: { x: 'one' } }) + await t.settle() + expect(t.href('a-suspended')).toBe('/a?x=one') + + t.gates.b = deferred() + const suspended = t.counts.suspendedUpdater + await t.start({ to: '/b' }) + expect(t.counts.suspendedUpdater).toBe(suspended) + await t.release('b') + await screen.findByText('B page') + }) + + test('StrictMode double mounting keeps holding and updating', async () => { + const t = setup({ strict: true }) + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.isActive('root-b')).toBe(true) + await t.start({ to: '/a', search: { x: 's' } }) + expect(t.href('a-self')).toBe('/a?x=s') + t.gates.b.resolve() + await t.settle() + expect(t.href('a-self')).toBe('/a?x=s') + expect(t.isActive('root-b')).toBe(false) + }) + + test.each([ + ['a-dot', '/a'], + ['a-next', '/a?x=one-next'], + ])( + 'clicking held link %s navigates to the href it displays', + async (id, displayed) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.router.state.status).toBe('pending') + expect(t.href(id)).toBe(displayed) + + await act(async () => { + fireEvent.click(t.link(id)) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe(displayed) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe(displayed) + expect(screen.getByText('A page')).toBeInTheDocument() + }, + ) + + test.each(['mouseEnter', 'focus', 'touchStart'] as const)( + 'a %s preload of a held link loads the location it displays', + async (event) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + t.aLoads.length = 0 + + await act(async () => { + fireEvent[event](t.link('a-next')) + await Promise.resolve() + }) + expect(t.aLoads).toEqual(['one-next']) + await t.release('b') + await screen.findByText('B page') + }, + ) + + test('a render preload of a link mounting in a departing match loads the location it displays', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.aLoads.length = 0 + + await act(async () => { + t.controls.setRenderPreload!(true) + await Promise.resolve() + }) + expect(t.href('a-render')).toBe('/a?x=one-render') + expect(t.aLoads).toEqual(['one-render']) + await t.release('b') + await screen.findByText('B page') + }) + + test('staying links click and preload from the live location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.a = deferred() + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.router.state.status).toBe('pending') + expect(t.href('a-next')).toBe('/a?x=two-next') + t.aLoads.length = 0 + + await act(async () => { + fireEvent.mouseEnter(t.link('a-next')) + await Promise.resolve() + }) + expect(t.aLoads).toEqual(['two-next']) + await act(async () => { + fireEvent.click(t.link('a-next')) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + await t.release('a') + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a revisited route starts with fresh links, also ones mounting during its next departure', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + await t.release('b') + await screen.findByText('B page') + await t.settle() + + t.nextFrom.length = 0 + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await screen.findByText('A page') + await t.settle() + // The remounted links never derive from the previous visit's location. + expect(t.nextFrom).not.toContain('one') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + // B is cached now: depart to a route that has not loaded yet. + t.gates.items = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/items/$id', params: { id: '1' } }) + expect(t.router.state.status).toBe('pending') + expect(t.counts.aUpdater).toBe(updater) + act(() => { + t.controls.setExtra!(true) + }) + // The new link holds this visit's location, not the previous visit's. + expect(t.href('a-extra')).toBe('/a?x=two') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.isActive('root-b')).toBe(false) + + await act(async () => { + fireEvent.click(t.link('a-extra')) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe('/a?x=two') + t.gates.items.resolve() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.isActive('a-extra')).toBe(true) + expect(t.href('a-next')).toBe('/a?x=two-next') + }) + + test('a document redirect from the destination does not break later navigations', async () => { + // jsdom reports the attempted document navigation as not implemented. + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c', reloadDocument: true }) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 0)) + }) + + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('a departure superseded by a history traversal back to the owner updates its links', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + await act(async () => { + t.router.history.go(-2) + await Promise.resolve() + }) + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await act(async () => { + await t.gates.b?.promise + }) + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=one') + }) + + test('invalidating a pending departure keeps holding until it commits', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + await act(async () => { + void t.router.invalidate() + await Promise.resolve() + }) + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.counts.aUpdater).toBe(updater) + }) + + test('a departure redirected or superseded to another departing location does no work', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c' }) + }, + }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '1' } }) + // B redirects to C after being superseded; neither keeps A. + await t.release('b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + await t.release('items') + await screen.findByText('Items page') + expect(t.router.state.location.pathname).toBe('/items/1') + + await act(() => t.router.navigate({ to: '/a' })) + await screen.findByText('A page') + const again = t.counts.aUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await screen.findByText('C page') + expect(t.counts.aUpdater).toBe(again) + }) + + test('a view transition callback that throws does not break later navigations', async () => { + vi.stubGlobal('CSS', { supports: () => true }) + ;(document as any).startViewTransition = (update: () => unknown) => { + update() + return { + updateCallbackDone: Promise.resolve(), + finished: Promise.resolve(), + } + } + const failures: Array = [] + const t = setup({ + // The history listener's load rejects with the callback's error. Record + // it instead of leaving it unhandled. + beforeRender: (router) => { + const load = router.load + router.load = (opts: any) => + load(opts).catch((error: unknown) => failures.push(error)) + }, + }) + await screen.findByText('A page') + await t.start({ + to: '/b', + viewTransition: { + types: () => { + throw new Error('types failed') + }, + }, + }) + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 0)) + }) + // The failed transaction leaves the router pending on the destination + // with the previous page displayed, without a newer publication. + expect(failures).toHaveLength(1) + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + delete (document as any).startViewTransition + vi.unstubAllGlobals() + + // A navigation that keeps the page updates its links. + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('links outside every match follow a pending navigation', async () => { + const t = setup() + await screen.findByText('A page') + cleanup() + const router = t.router + const InnerWrap = ({ children }: { children: React.ReactNode }) => ( + <> + + wrap b + + {children} + + ) + router.update({ ...router.options, InnerWrap }) + render() + await screen.findByText('A page') + expect(t.isActive('wrap-b')).toBe(false) + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(router.state.status).toBe('pending') + expect(t.isActive('wrap-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('wrap-b')).toBe(true) + }) +}) + +describe('masked links in a departing match', () => { + test.each(['mask', 'routeMasks'] as const)( + 'clicking a held link with a location-dependent %s pushes the masked href it displays', + async (kind) => { + const root = createRootRoute() + const gate: { b?: Deferred } = {} + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + ({ id: prev.x })} + hash + mask={ + kind === 'mask' + ? ({ to: '.', search: true, hash: true } as any) + : undefined + } + data-testid="masked" + > + masked + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: () => gate.b?.promise, + component: () =>

B page

, + }) + const photo = createRoute({ + getParentRoute: () => root, + path: '/photo', + component: () =>

Photo page

, + }) + const routeTree = root.addChildren([a, b, photo]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a?x=one#h'] }), + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/a', + search: true, + hash: true, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + gate.b = deferred() + await act(async () => { + void router.navigate({ to: '/b' }) + await Promise.resolve() + }) + expect(router.state.status).toBe('pending') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + await act(async () => { + fireEvent.click(link) + await Promise.resolve() + }) + // The URL bar shows the masked href the link displayed. + expect(router.history.location.href).toBe('/a?x=one#h') + expect(router.latestLocation.pathname).toBe('/photo') + expect(router.latestLocation.search).toEqual({ id: 'one' }) + gate.b.resolve() + await screen.findByText('Photo page') + expect(router.history.location.href).toBe('/a?x=one#h') + }, + ) + + test.each(['mask', 'routeMasks'] as const)( + 'a link with a fixed %s builds its location once and does not rerender across navigations', + async (kind) => { + // Every location the router builds for the masked link passes through + // the output rewrite. + let maskedBuilds = 0 + let renders = 0 + const root = createRootRoute({ + component: () => ( + <> + + {() => { + renders++ + return 'masked' + }} + + + + ), + }) + const routes = ['a', 'b', 'photo', 'posts'].map((path) => + createRoute({ + getParentRoute: () => root, + path: `/${path}`, + component: () =>

{path} page

, + }), + ) + const routeTree = root.addChildren(routes) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a'] }), + rewrite: { + output: ({ url }) => { + if (url.pathname === '/photo' || url.pathname === '/posts') { + maskedBuilds++ + } + return url + }, + }, + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/posts', + search: { from: 'photo' }, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/posts?from=photo') + const buildsAfterMount = maskedBuilds + const rendersAfterMount = renders + + for (const to of ['/b', '/a', '/b']) { + await act(() => router.navigate({ to })) + await screen.findByText(`${to.slice(1)} page`) + } + expect(link).toHaveAttribute('href', '/posts?from=photo') + expect(maskedBuilds).toBe(buildsAfterMount) + expect(renders).toBe(rendersAfterMount) + }, + ) +}) + +describe('link scope retention', () => { + setFlagsFromString('--expose-gc') + const gc: () => void = runInNewContext('gc') + async function collect() { + for (let round = 0; round < 3; round++) { + await new Promise((resolve) => setTimeout(resolve, 0)) + gc() + } + } + const alive = (refs: Array>) => + refs.flatMap((ref, index) => (ref.deref() ? [index] : [])) + + // Builds and renders a router whose route `/a` and root render Links, and + // returns a function that visits a location with a large history state. + function renderApp() { + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ prev} data-testid="a-self"> + a self + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return async (to: string, index: number) => { + await act(() => + router.navigate({ + to, + search: { i: index }, + state: { payload: new Array(100_000).fill(index) } as any, + replace: true, + } as any), + ) + await waitFor(() => expect(router.state.status).toBe('idle')) + const location: any = router.state.location + return [new WeakRef(location), new WeakRef(location.state.payload)] + } + } + + test( + 'locations with large history state are collectable after their route is left', + { timeout: 20_000 }, + async () => { + const visit = renderApp() + await screen.findByText('A page') + // The router may keep its first navigation's state (also on main). + await visit('/a', 0) + const left: Array> = [] + for (let index = 1; index < 5; index++) { + left.push(...(await visit('/a', index))) + } + for (let index = 5; index < 9; index++) { + left.push(...(await visit('/b', index))) + } + await visit('/b', 9) + await screen.findByText('B page') + await collect() + // Only the current location (and its payload) stays reachable. + expect(alive(left)).toEqual([]) + }, + ) +}) + +describe('links after a same-href navigation that changes history state', () => { + function renderStateApp() { + // The `tag` state of every `/b` load, preloads included. + const bLoads: Array = [] + const root = createRootRoute({ component: () => }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + inherit + + ({ tag: `${prev.tag}-updated` }) as any} + data-testid="updater" + > + updater + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: ({ location }) => { + bLoads.push((location.state as any).tag) + }, + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return { router, bLoads } + } + + async function changeState(router: any) { + await screen.findByText('A page') + await act(() => + router.navigate({ + to: '/a', + state: { tag: 'latest' } as any, + replace: true, + }), + ) + expect(router.state.location.href).toBe('/a') + expect(router.state.location.state.tag).toBe('latest') + } + + test.each([ + ['inherit', 'latest'], + ['updater', 'latest-updated'], + ])( + 'clicking link %s derives its state from the latest location', + async (id, tag) => { + const { router } = renderStateApp() + await changeState(router) + + fireEvent.click(screen.getByTestId(id)) + await screen.findByText('B page') + expect(router.state.location.pathname).toBe('/b') + expect((router.state.location.state as any).tag).toBe(tag) + }, + ) + + test('preloading derives its state from the latest location', async () => { + const { router, bLoads } = renderStateApp() + await changeState(router) + + fireEvent.mouseEnter(screen.getByTestId('inherit')) + await waitFor(() => expect(bLoads).toEqual(['latest'])) + }) +}) diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx index f33fe65803..31daa6d551 100644 --- a/packages/react-router/tests/link-destination.test.tsx +++ b/packages/react-router/tests/link-destination.test.tsx @@ -4,6 +4,7 @@ import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { Link, Outlet, + RouterContextProvider, RouterProvider, createMemoryHistory, createRootRoute, @@ -305,4 +306,193 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('data-status', 'active') expect(link).toHaveTextContent('Current item') }) + + test('masked destinations follow their inputs', async () => { + // A stable mask object that inherits params, and a mask prop that changes. + const inheritedMask = { to: '/visible/$id', params: true } as const + const rootRoute = createRootRoute({ + component: function Root() { + const [id, setId] = React.useState('one') + return ( + <> + + + + + + ) + }, + }) + const routes = ['/source/$id', '/target/$id', '/visible/$id'].map((path) => + createRoute({ getParentRoute: () => rootRoute, path }), + ) + const router = createRouter({ + routeTree: rootRoute.addChildren(routes), + history: createMemoryHistory({ initialEntries: ['/source/one'] }), + }) + render() + + const propMask = await screen.findByTestId('prop-mask') + const inherited = screen.getByTestId('inherited-mask') + expect(propMask).toHaveAttribute('href', '/visible/one') + expect(inherited).toHaveAttribute('href', '/visible/one') + + await act(() => + router.navigate({ to: '/source/$id', params: { id: 'two' } } as any), + ) + expect(inherited).toHaveAttribute('href', '/visible/two') + expect(propMask).toHaveAttribute('href', '/visible/one') + + fireEvent.click(screen.getByRole('button', { name: 'Change mask' })) + expect(propMask).toHaveAttribute('href', '/visible/two') + }) +}) + +describe('Link props that change without a destination prop', () => { + afterEach(() => { + cleanup() + vi.useRealTimers() + }) + + async function setup(targetLoader?: () => void, nextLoader?: () => void) { + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/a' }), + createRoute({ + getParentRoute: () => root, + path: '/b', + loader: targetLoader, + }), + createRoute({ + getParentRoute: () => root, + path: '/c', + loader: nextLoader, + }), + ]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + await router.load() + return router + } + + test('changing reloadDocument affects the next click', async () => { + const router = await setup() + const blockedTargets: Array = [] + const unblock = router.history.block({ + blockerFn: ({ nextLocation }) => { + blockedTargets.push(nextLocation.pathname) + return true + }, + }) + function Example() { + const [reload, setReload] = React.useState(false) + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + try { + fireEvent.click(screen.getByRole('button', { name: 'Enable reload' })) + await act(() => { + fireEvent.click(screen.getByRole('link', { name: 'Target' })) + }) + // A document navigation shows blockers the current history location; + // a client navigation would show the pending /b location. + expect(blockedTargets).toEqual(['/a']) + expect(router.history.location.pathname).toBe('/a') + } finally { + unblock() + } + }) + + test('changing href updates the displayed target and active state', async () => { + const router = await setup() + function Example() { + const [changed, setChanged] = React.useState(false) + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + const link = screen.getByRole('link', { name: 'Target' }) + expect(link).toHaveAttribute('href', '/a') + expect(link).toHaveAttribute('aria-current', 'page') + fireEvent.click(screen.getByRole('button', { name: 'Change href' })) + expect(link).toHaveAttribute('href', '/b') + expect(link).not.toHaveAttribute('aria-current') + }) + + test('changing href cancels intent work for the old target and preloads and navigates to the new one', async () => { + const oldLoader = vi.fn() + const nextLoader = vi.fn() + const router = await setup(oldLoader, nextLoader) + vi.useFakeTimers() + function Example() { + const [href, setHref] = React.useState('/b') + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + const link = screen.getByRole('link', { name: 'Target' }) + expect(link).toHaveAttribute('href', '/b') + fireEvent.mouseOver(link) + await act(() => vi.advanceTimersByTimeAsync(20)) + fireEvent.click(screen.getByRole('button', { name: 'Retarget' })) + expect(link).toHaveAttribute('href', '/c') + await act(() => vi.advanceTimersByTimeAsync(100)) + expect(oldLoader).not.toHaveBeenCalled() + expect(nextLoader).not.toHaveBeenCalled() + + fireEvent.mouseLeave(link) + fireEvent.mouseOver(link) + await act(() => vi.advanceTimersByTimeAsync(50)) + expect(nextLoader).toHaveBeenCalledTimes(1) + expect(router.state.location.pathname).toBe('/a') + + await act(() => { + fireEvent.click(link) + }) + expect(router.state.location.pathname).toBe('/c') + expect(link).toHaveAttribute('aria-current', 'page') + expect(oldLoader).not.toHaveBeenCalled() + }) }) diff --git a/packages/react-router/tests/link-selector.test.tsx b/packages/react-router/tests/link-selector.test.tsx new file mode 100644 index 0000000000..eee6906265 --- /dev/null +++ b/packages/react-router/tests/link-selector.test.tsx @@ -0,0 +1,192 @@ +import React from 'react' +import { act, cleanup, render, waitFor } from '@testing-library/react' +import { afterEach, expect, test, vi } from 'vitest' +import { + Link, + RouterContextProvider, + RouterProvider, + createHashHistory, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +async function setup(trailingSlash: 'never' | 'preserve' = 'never') { + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/posts/$id' }), + ]), + history: createMemoryHistory({ initialEntries: ['/posts/1'] }), + trailingSlash, + }) + await router.load() + return router +} + +test('a fixed href follows active, inactive and active-again locations', async () => { + const router = await setup() + const view = render( + + + Post + + , + ) + const link = view.getByText('Post') + for (const [id, page, active] of [ + ['1', 1, true], + ['2', 1, false], + ['1', 2, false], + ['1', 1, true], + ] as const) { + await act(() => + router.navigate({ to: '/posts/$id', params: { id }, search: { page } }), + ) + expect(link).toHaveAttribute('href', '/posts/1?page=1') + expect(link.getAttribute('aria-current')).toBe(active ? 'page' : null) + } +}) + +test('changed destination, active options and disabled props replace prepared state', async () => { + const router = await setup() + function tree(id: string, disabled = false, includeSearch = true) { + return ( + + + Post + + + ) + } + const view = render(tree('1')) + const link = view.getByText('Post') + expect(link).not.toHaveAttribute('aria-current') + view.rerender(tree('1', false, false)) + expect(link).toHaveAttribute('aria-current', 'page') + view.rerender(tree('1', true, false)) + expect(link).not.toHaveAttribute('href') + expect(link).toHaveAttribute('aria-current', 'page') + view.rerender(tree('2', false, false)) + expect(link).toHaveAttribute('href', '/posts/2?page=1') + expect(link).not.toHaveAttribute('aria-current') + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('aria-current', 'page') +}) + +test('hash history refreshes a cached destination after the outer URL changes', async () => { + const original = window.location.href + window.history.replaceState(null, '', '/shell?outer=one#/posts/1') + const history = createHashHistory() + const root = createRootRoute({ + component: () => ( + + Post + + ), + }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/posts/$id' }), + ]), + history, + trailingSlash: 'never', + }) + try { + const view = render() + const link = await view.findByText('Post') + expect(link).toHaveAttribute('href', '/shell?outer=one#/posts/1') + expect(link).toHaveAttribute('aria-current', 'page') + act(() => { + window.history.replaceState(null, '', '/other?outer=two#/posts/2') + }) + await waitFor(() => { + expect(link).toHaveAttribute('href', '/other?outer=two#/posts/1') + expect(link).not.toHaveAttribute('aria-current') + }) + } finally { + cleanup() + history.destroy() + window.history.replaceState(null, '', original) + } +}) + +test.each([false, true])( + 'cached paths retain segment boundaries and basepaths (exact=%s)', + async (exact) => { + const router = await setup() + router.update({ basepath: '/app', trailingSlash: 'preserve' }) + const view = render( + + + Post + + , + ) + const link = view.getByText('Post') + for (const [to, active] of [ + ['/posts/1', true], + ['/posts/1/details', !exact], + ['/posts/10', false], + ['/posts/1/', true], + ] as const) { + await act(() => router.navigate({ to })) + expect(link).toHaveAttribute('href', '/app/posts/1/') + expect(link.getAttribute('aria-current')).toBe(active ? 'page' : null) + } + router.update({ basepath: '/new' }) + await act(() => router.navigate({ to: '/posts/1/' })) + expect(link).toHaveAttribute('href', '/new/posts/1/') + expect(link).toHaveAttribute('aria-current', 'page') + }, +) + +test('external classification follows changed destinations and router instances', async () => { + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const router = await setup() + router.update({ protocolAllowlist: ['https:', 'custom:'] }) + function tree(to: string, currentRouter = router) { + return ( + + Destination + + ) + } + const view = render(tree('/posts/1')) + const link = view.getByText('Destination') + expect(link).toHaveAttribute('aria-current', 'page') + for (const to of ['https://other.example/', 'custom:post']) { + view.rerender(tree(to)) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('href', to) + expect(link).not.toHaveAttribute('aria-current') + } + view.rerender(tree('javascript:blocked()')) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '1' } })) + expect(link).not.toHaveAttribute('href') + expect(link).not.toHaveAttribute('aria-current') + view.rerender(tree('/posts/2')) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('href', '/posts/2') + expect(link).toHaveAttribute('aria-current', 'page') + + // Each mounted router keeps its allowlist; switching routers resets the selector. + view.rerender(tree('custom:post')) + expect(link).toHaveAttribute('href', 'custom:post') + const otherRouter = await setup() + view.rerender(tree('custom:post', otherRouter)) + expect(link).not.toHaveAttribute('href') + expect(link).not.toHaveAttribute('aria-current') +}) diff --git a/packages/react-router/tests/link.bench.tsx b/packages/react-router/tests/link.bench.tsx index 239173340b..6871afc8a4 100644 --- a/packages/react-router/tests/link.bench.tsx +++ b/packages/react-router/tests/link.bench.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react' -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' import { getRouteSegments } from '@tanstack/router-core' import { Link, @@ -82,9 +82,8 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - bench( - 'hardcoded href', - () => { + test('hardcoded href', async ({ bench }) => { + await bench('hardcoded href', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => (
@@ -93,13 +92,13 @@ describe.each([ )), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'interpolate path', - () => { + test('interpolate path', async ({ bench }) => { + await bench('interpolate path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'build location', - () => { + test('build location', async ({ bench }) => { + await bench('build location', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to absolute path', - () => { + test('link to absolute path', async ({ bench }) => { + await bench('link to absolute path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to relative path', - () => { + test('link to relative path', async ({ bench }) => { + await bench('link to relative path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => { const to = `./params/$param${Math.min(i, matchedParamId)}` @@ -174,13 +173,13 @@ describe.each([ }), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to current path', - () => { + test('link to current path', async ({ bench }) => { + await bench('link to current path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( @@ -189,7 +188,8 @@ describe.each([ )), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) }) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 46e6cb8685..56c4ece9db 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -1151,10 +1151,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1211,10 +1214,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/app/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -6803,14 +6809,12 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', + // The links stay mounted across the navigation so they can turn active. + const rootRoute = createRootRoute({ component: () => { return ( <> -

Index Route

+ { ) }, }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, diff --git a/packages/react-router/tests/match-provider.test.tsx b/packages/react-router/tests/match-provider.test.tsx new file mode 100644 index 0000000000..bc947fff05 --- /dev/null +++ b/packages/react-router/tests/match-provider.test.tsx @@ -0,0 +1,90 @@ +import * as React from 'react' +import { act, cleanup, render, screen } from '@testing-library/react' +import { renderToString } from 'react-dom/server' +import { afterEach, expect, test } from 'vitest' +import { + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + useMatch, +} from '../src' + +afterEach(cleanup) + +function NearestMatch({ name }: { name: string }) { + const match = useMatch({ strict: false }) + return {match.routeId} +} + +function createTestRouter( + disableGlobalCatchBoundary = false, + isServer = false, +) { + const root = createRootRoute({ + shellComponent: function Shell({ children }) { + const [count, setCount] = React.useState(0) + return ( +
+ + + {children} +
+ ) + }, + component: () => ( + <> + + + + ), + }) + const first = createRoute({ + getParentRoute: () => root, + path: '/first', + component: () => , + }) + const second = createRoute({ + getParentRoute: () => root, + path: '/second', + component: () => , + }) + return createRouter({ + routeTree: root.addChildren([first, second]), + history: createMemoryHistory({ initialEntries: ['/first'] }), + disableGlobalCatchBoundary, + isServer, + }) +} + +test.each([false, true])( + 'shell keeps nearest match context and state across navigation (global catch disabled: %s)', + async (disableGlobalCatchBoundary) => { + const router = createTestRouter(disableGlobalCatchBoundary) + await router.load() + render() + expect(await screen.findByTestId('leaf-match')).toHaveTextContent('/first') + expect(screen.getByTestId('shell-match')).toHaveTextContent('__root__') + expect(screen.getByTestId('root-match')).toHaveTextContent('__root__') + const shell = screen.getByTestId('shell') + act(() => screen.getByRole('button').click()) + await act(async () => { + await router.navigate({ to: '/second' }) + }) + expect(screen.getByTestId('leaf-match')).toHaveTextContent('/second') + expect(screen.getByTestId('shell-match')).toHaveTextContent('__root__') + expect(screen.getByTestId('shell')).toBe(shell) + expect(screen.getByRole('button')).toHaveTextContent('Count 1') + }, +) + +test('server shell and nested component read their nearest match context', async () => { + const router = createTestRouter(false, true) + await router.load() + const html = renderToString() + expect(html).toContain('data-testid="shell-match">__root__') + expect(html).toContain('data-testid="root-match">__root__') + expect(html).toContain('data-testid="leaf-match">/first') +}) diff --git a/packages/react-router/tests/setupTests.tsx b/packages/react-router/tests/setupTests.tsx index c3d7ec5cf7..6ab5039d6e 100644 --- a/packages/react-router/tests/setupTests.tsx +++ b/packages/react-router/tests/setupTests.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { vi } from 'vitest' // @ts-expect-error diff --git a/packages/react-router/tests/useBlocker.test.tsx b/packages/react-router/tests/useBlocker.test.tsx index c11cd054f1..e13437780e 100644 --- a/packages/react-router/tests/useBlocker.test.tsx +++ b/packages/react-router/tests/useBlocker.test.tsx @@ -1,5 +1,4 @@ import React from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index 1ec1072a26..3acf185b22 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1,5 +1,4 @@ import React, { act } from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, diff --git a/packages/react-router/vite.config.ts b/packages/react-router/vite.config.ts index 0eb9e3c77e..798d9b74e4 100644 --- a/packages/react-router/vite.config.ts +++ b/packages/react-router/vite.config.ts @@ -18,7 +18,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, - setupFiles: ['./tests/setupTests.tsx'], + setupFiles: ['./tests/jest-dom.setup.ts', './tests/setupTests.tsx'], }, }) diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 05d493cad2..1cb31dea24 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,65 @@ # @tanstack/react-start-client +## 1.168.45 + +### Patch Changes + +- [#8653](https://github.com/TanStack/router/pull/8653) [`d66a84b`](https://github.com/TanStack/router/commit/d66a84ba0a74ffd03e22b57ccd90796274c96244) - fix: a `visible()` boundary keeps its server HTML when the intersection arrives while React waits to replay the boundary's render + +## 1.168.44 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398)]: + - @tanstack/react-router@1.170.46 + - @tanstack/router-core@1.171.39 + - @tanstack/start-client-core@1.170.39 + +## 1.168.43 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/react-router@1.170.45 + - @tanstack/start-client-core@1.170.38 + +## 1.168.42 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + - @tanstack/start-client-core@1.170.37 + - @tanstack/react-router@1.170.44 + +## 1.168.41 + +### Patch Changes + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-client-core@1.170.36 + - @tanstack/react-router@1.170.43 + +## 1.168.40 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-client-core@1.170.35 + +## 1.168.39 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + ## 1.168.38 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 1ba7594f6d..b919d47b92 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.38", + "version": "1.168.45", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/src/hydration/visible.tsx b/packages/react-start-client/src/hydration/visible.tsx index e274285cb8..b295d77462 100644 --- a/packages/react-start-client/src/hydration/visible.tsx +++ b/packages/react-start-client/src/hydration/visible.tsx @@ -26,20 +26,22 @@ function HydrationBoundary(props: { o?: () => void children?: React.ReactNode }) { - const { g, o } = props - - if (!g.r) { - if (!reactUse) { - throw g.p - } - - reactUse(g.p) - } - + // Above the gate: a replay after `use` suspended can find the gate open and + // skip `use`, and only `use` leaves the replay's dispatcher, which rejects a + // hook the first attempt did not reach. + const { o } = props React.useEffect(() => { o?.() }, [o]) + if (!props.g.r) { + if (!reactUse) { + throw props.g.p + } + + reactUse(props.g.p) + } + return props.children as React.JSX.Element } diff --git a/packages/react-start-client/src/tests/Hydrate.test.tsx b/packages/react-start-client/src/tests/Hydrate.test.tsx index 0d0ce1faad..0e7abe502a 100644 --- a/packages/react-start-client/src/tests/Hydrate.test.tsx +++ b/packages/react-start-client/src/tests/Hydrate.test.tsx @@ -12,7 +12,14 @@ import { import { afterEach, describe, expect, it, vi } from 'vitest' import { hydrateIdAttribute } from '@tanstack/start-client-core/hydration/constants' import { Hydrate } from '../Hydrate' -import { condition, idle, interaction, load, never } from '../hydration' +import { + condition, + idle, + interaction, + load, + never, + visible, +} from '../hydration' import type { HydrateProps, HydrationPrefetchStrategy } from '../Hydrate' const InternalHydrate = Hydrate as React.ComponentType< @@ -673,4 +680,84 @@ describe('Hydrate', () => { await unmountHydratedRoot(root, container) } }) + + // `visible()` reads its gate's mutable flag during render (`if (!g.r) use(g.p)`). + // React replays a component that suspended in `use` with its re-render + // dispatcher, and only `use` switches away from it: when the intersection + // arrives while React waits to replay, the flag is true, the replay skips + // `use`, and a hook after it would throw "Update hook called on initial render" + // (#467 in production). React would then discard the boundary's server HTML. + // Which task the intersection lands in is the browser's choice, so this runs + // it in each of the tasks around the boundary's first hydration attempt. + it('hydrates a visible boundary whichever task the intersection arrives in', async () => { + const actEnvironment = globalThis as { + IS_REACT_ACT_ENVIRONMENT?: boolean + } + const wasActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT + actEnvironment.IS_REACT_ACT_ENVIRONMENT = false + const nextTask = () => new Promise((resolve) => setImmediate(resolve)) + const app = (onHydrated?: () => void) => ( + fallback

} + onHydrated={onHydrated} + > +

child

+
+ ) + vi.stubGlobal('window', undefined) + const html = renderToString(app()) + vi.unstubAllGlobals() + const failed: Array<{ tasks: number; errors: Array }> = [] + try { + for (let tasks = 0; tasks < 12; tasks++) { + vi.stubGlobal( + 'IntersectionObserver', + class { + constructor(private notify: IntersectionObserverCallback) {} + observe() { + void (async () => { + for (let task = 0; task < tasks; task++) { + await nextTask() + } + this.notify( + [{ isIntersecting: true } as IntersectionObserverEntry], + this as unknown as IntersectionObserver, + ) + })() + } + disconnect() {} + }, + ) + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + const errors: Array = [] + const hydrated = new Promise((resolve) => { + const root = hydrateRoot( + container, + app(() => { + resolve() + setImmediate(() => { + root.unmount() + container.remove() + }) + }), + { + onRecoverableError: (error) => { + errors.push(String((error as Error).cause ?? error)) + }, + }, + ) + }) + await hydrated + if (errors.length > 0) { + failed.push({ tasks, errors }) + } + } + } finally { + actEnvironment.IS_REACT_ACT_ENVIRONMENT = wasActEnvironment + } + expect(failed).toEqual([]) + }) }) diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 0eac4439fd..fae6bcabee 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,96 @@ # @tanstack/react-start-rsc +## 0.1.67 + +### Patch Changes + +- Updated dependencies [[`3f22686`](https://github.com/TanStack/router/commit/3f226869e0af211ff7f1de5d7343e43462dbb101), [`559c7de`](https://github.com/TanStack/router/commit/559c7ded6e2a6eeda3f91c80d8c03f4cfeb9a206)]: + - @tanstack/start-plugin-core@1.171.57 + +## 0.1.66 + +### Patch Changes + +- Updated dependencies [[`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69), [`01fab5a`](https://github.com/TanStack/router/commit/01fab5a6c8aed70d61d82c64bc344cbac66c240c), [`c5320d7`](https://github.com/TanStack/router/commit/c5320d7ca23eca82d720ac5629d2bad5cf7d9b02), [`545a8d3`](https://github.com/TanStack/router/commit/545a8d3790989ca502153c3292c6b1e8063257f4), [`da8c28c`](https://github.com/TanStack/router/commit/da8c28c498230a5730ce75b2693baeeb3ef68ac1)]: + - @tanstack/router-utils@1.163.0 + - @tanstack/start-plugin-core@1.171.56 + +## 0.1.65 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398), [`ed55775`](https://github.com/TanStack/router/commit/ed5577593a749b8c7193cc7b5d945fd084bfac2f), [`63a886d`](https://github.com/TanStack/router/commit/63a886da9040c4b039ea3bf5b3a841771375cddb), [`d9b07e8`](https://github.com/TanStack/router/commit/d9b07e8d3b724cdbfac0aa2fba4c1f7a3a241100)]: + - @tanstack/react-router@1.170.46 + - @tanstack/router-core@1.171.39 + - @tanstack/start-client-core@1.170.39 + - @tanstack/start-plugin-core@1.171.55 + - @tanstack/start-storage-context@1.167.41 + +## 0.1.64 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/react-router@1.170.45 + - @tanstack/start-client-core@1.170.38 + - @tanstack/start-plugin-core@1.171.54 + - @tanstack/start-storage-context@1.167.40 + +## 0.1.63 + +### Patch Changes + +- Updated dependencies [[`fdc10fa`](https://github.com/TanStack/router/commit/fdc10fa13fbac758615f9a3d37075088d1cc1e1f), [`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e)]: + - @tanstack/start-plugin-core@1.171.53 + - @tanstack/router-utils@1.162.4 + +## 0.1.62 + +### Patch Changes + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-storage-context@1.167.39 + - @tanstack/router-core@1.171.37 + - @tanstack/start-plugin-core@1.171.52 + - @tanstack/start-client-core@1.170.37 + - @tanstack/react-router@1.170.44 + +## 0.1.61 + +### Patch Changes + +- [#8696](https://github.com/TanStack/router/pull/8696) [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae) - Require Vite 8 for Vite builds. Vite 7 is no longer supported. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f3d7ee3`](https://github.com/TanStack/router/commit/f3d7ee3374c660e0fe82a03ac580a90ed2e2fa98), [`4104b8e`](https://github.com/TanStack/router/commit/4104b8ef11498706b5059c5a915f2ae47ffbc5ba), [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae), [`19524cc`](https://github.com/TanStack/router/commit/19524ccdd75870ce1db2f324518eeb3f23cc0f97)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-storage-context@1.167.38 + - @tanstack/start-client-core@1.170.36 + - @tanstack/start-plugin-core@1.171.51 + - @tanstack/react-router@1.170.43 + +## 0.1.60 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/start-client-core@1.170.35 + - @tanstack/start-storage-context@1.167.37 + +## 0.1.59 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + - @tanstack/start-storage-context@1.167.36 + ## 0.1.58 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 9cd7d0ee29..40b1847068 100644 --- a/packages/react-start-rsc/package.json +++ b/packages/react-start-rsc/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-rsc", - "version": "0.1.58", + "version": "0.1.67", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", @@ -107,11 +107,11 @@ "pathe": "catalog:" }, "devDependencies": { - "@rspack/core": "2.0.0", + "@rspack/core": "2.2.7", "@testing-library/react": "catalog:", "@vitejs/plugin-react": "catalog:", - "@vitejs/plugin-rsc": "^0.5.30", - "react-server-dom-rspack": "^0.0.2", + "@vitejs/plugin-rsc": "^0.5.39", + "react-server-dom-rspack": "^0.1.1", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", "jsdom": "catalog:", @@ -127,10 +127,10 @@ }, "peerDependencies": { "@rspack/core": ">=2.0.0-0", - "@vitejs/plugin-rsc": ">=0.5.30", + "@vitejs/plugin-rsc": ">=0.5.38", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "react-server-dom-rspack": ">=0.0.2" + "react-server-dom-rspack": ">=0.1.1" }, "peerDependenciesMeta": { "@rspack/core": { diff --git a/packages/react-start-rsc/src/plugin/vite.ts b/packages/react-start-rsc/src/plugin/vite.ts index 90da9d8b96..9aa9523c6a 100644 --- a/packages/react-start-rsc/src/plugin/vite.ts +++ b/packages/react-start-rsc/src/plugin/vite.ts @@ -109,7 +109,7 @@ export function reactStartRscVitePlugin(): PluginOption { ], }, build: { - rollupOptions: { + rolldownOptions: { input: { index: rscEntryPath, }, diff --git a/packages/react-start-rsc/tests/rscCssTransform.test.tsx b/packages/react-start-rsc/tests/rscCssTransform.test.tsx index 0e2c2e45cf..afc4686e94 100644 --- a/packages/react-start-rsc/tests/rscCssTransform.test.tsx +++ b/packages/react-start-rsc/tests/rscCssTransform.test.tsx @@ -161,4 +161,55 @@ describe('RSC CSS compiler transforms', () => { detectKindsInCode(code, 'client', { compilerTransforms }), ).toMatchInlineSnapshot(`Set {}`) }) + + test('rewrites render APIs imported from @tanstack/react-start-rsc', async () => { + const code = await compileWithRscCssTransform({ + code: ` + import { renderServerComponent } from '@tanstack/react-start-rsc' + + export const renderable = renderServerComponent() + `, + }) + + expect(code).toContain( + '__tanstackStartRscCss: import.meta.viteRsc.loadCss()', + ) + }) + + test.each([ + { wrapped: '()', bare: '' }, + { wrapped: ' as any', bare: '' }, + { wrapped: '!', bare: '' }, + { wrapped: '(<>) satisfies unknown', bare: '<>' }, + ])( + 'streams $wrapped like the bare JSX it wraps', + async ({ wrapped, bare }) => { + const compileStream = (element: string) => + compileWithRscCssTransform({ + code: ` + import { renderToReadableStream } from '@tanstack/react-start/rsc' + + export const stream = renderToReadableStream(${element}) + `, + }) + + const bareCode = await compileStream(bare) + expect(bareCode).toContain('import.meta.viteRsc.loadCss()') + expect(await compileStream(wrapped)).toBe(bareCode) + }, + ) + + test('does not stream JSX that is not the whole argument', async () => { + const code = await compileWithRscCssTransform({ + code: ` + import { renderToReadableStream } from '@tanstack/react-start/rsc' + + export const conditional = renderToReadableStream(flag ?
: ) + export const spread = renderToReadableStream(...args) + `, + }) + + expect(code).toContain('renderToReadableStream(...args)') + expect(code).not.toContain('loadCss') + }) }) diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 370829a92b..86d7854a59 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,72 @@ # @tanstack/react-start-server +## 1.167.52 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398)]: + - @tanstack/react-router@1.170.46 + - @tanstack/router-core@1.171.39 + - @tanstack/start-server-core@1.169.45 + +## 1.167.51 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/start-server-core@1.169.44 + - @tanstack/react-router@1.170.45 + +## 1.167.50 + +### Patch Changes + +- Updated dependencies [[`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08)]: + - @tanstack/start-server-core@1.169.43 + +## 1.167.49 + +### Patch Changes + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-server-core@1.169.42 + - @tanstack/router-core@1.171.37 + - @tanstack/react-router@1.170.44 + +## 1.167.48 + +### Patch Changes + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Remove the built-in `useSession` API. Applications choose a session library, such as iron-session, and save or destroy sessions explicitly before returning or redirecting. Connect a cookie adapter through `getCookie` and `setCookie`, or append serialized cookies with `appendResponseHeader('set-cookie', cookie)`. Existing session cookies require a deliberate migration or signing in again with a new cookie name. + + `createServerEntry` keeps the complete callback, including custom error handling, inside the request context and converts errors that escape it. The built-in entry still converts errors automatically. Raw `createStartHandler` handlers now rethrow the original error. For custom reporting, catch inside `createServerEntry`, then rethrow for default conversion or return `handleStartError(error)` to preserve response-helper status, headers, and cookies. Return an explicit `Response` when choosing a custom error payload. + + Response helpers now apply consistently across server routes, SSR, server functions, redirects, errors, and middleware response replacements. Helper setters override returned values; cookie helpers preserve independent cookies and replace matching cookie identities. Use `appendResponseHeader('set-cookie', cookie)` when adding a serialized cookie without replacing other cookies. Changed responses receive copied headers and reuse the body stream, so applications should inspect the response returned by Start rather than relying on mutation of the original response. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-server-core@1.169.41 + - @tanstack/react-router@1.170.43 + +## 1.167.47 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-server-core@1.169.40 + +## 1.167.46 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + ## 1.167.45 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index c0d6cd06bc..a725b70d9c 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.45", + "version": "1.167.52", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 72f34da2cd..9d6432f985 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,132 @@ # @tanstack/react-start +## 1.169.6 + +### Patch Changes + +- Updated dependencies [[`3f22686`](https://github.com/TanStack/router/commit/3f226869e0af211ff7f1de5d7343e43462dbb101), [`559c7de`](https://github.com/TanStack/router/commit/559c7ded6e2a6eeda3f91c80d8c03f4cfeb9a206)]: + - @tanstack/start-plugin-core@1.171.57 + - @tanstack/react-start-rsc@0.1.67 + +## 1.169.5 + +### Patch Changes + +- [#8863](https://github.com/TanStack/router/pull/8863) [`01fab5a`](https://github.com/TanStack/router/commit/01fab5a6c8aed70d61d82c64bc344cbac66c240c) - The Rsbuild plugin keeps the app's `server.compress` setting instead of always setting it to `false`. Compression stays off by default: a compressed streamed page reaches the browser only once the stream ends. The optional `@rsbuild/core` peer is now `^2.0.5`, the first version whose compression keeps SSR response headers intact. + +- Updated dependencies [[`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69), [`01fab5a`](https://github.com/TanStack/router/commit/01fab5a6c8aed70d61d82c64bc344cbac66c240c), [`c5320d7`](https://github.com/TanStack/router/commit/c5320d7ca23eca82d720ac5629d2bad5cf7d9b02), [`545a8d3`](https://github.com/TanStack/router/commit/545a8d3790989ca502153c3292c6b1e8063257f4), [`da8c28c`](https://github.com/TanStack/router/commit/da8c28c498230a5730ce75b2693baeeb3ef68ac1), [`d66a84b`](https://github.com/TanStack/router/commit/d66a84ba0a74ffd03e22b57ccd90796274c96244)]: + - @tanstack/router-utils@1.163.0 + - @tanstack/start-plugin-core@1.171.56 + - @tanstack/react-start-client@1.168.45 + - @tanstack/react-start-rsc@0.1.66 + +## 1.169.4 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398), [`ed55775`](https://github.com/TanStack/router/commit/ed5577593a749b8c7193cc7b5d945fd084bfac2f), [`63a886d`](https://github.com/TanStack/router/commit/63a886da9040c4b039ea3bf5b3a841771375cddb), [`d9b07e8`](https://github.com/TanStack/router/commit/d9b07e8d3b724cdbfac0aa2fba4c1f7a3a241100)]: + - @tanstack/react-router@1.170.46 + - @tanstack/start-client-core@1.170.39 + - @tanstack/start-server-core@1.169.45 + - @tanstack/start-plugin-core@1.171.55 + - @tanstack/react-start-client@1.168.44 + - @tanstack/react-start-rsc@0.1.65 + - @tanstack/react-start-server@1.167.52 + +## 1.169.3 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/start-server-core@1.169.44 + - @tanstack/react-router@1.170.45 + - @tanstack/react-start-client@1.168.43 + - @tanstack/react-start-rsc@0.1.64 + - @tanstack/react-start-server@1.167.51 + - @tanstack/start-client-core@1.170.38 + - @tanstack/start-plugin-core@1.171.54 + +## 1.169.2 + +### Patch Changes + +- Updated dependencies [[`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08), [`fdc10fa`](https://github.com/TanStack/router/commit/fdc10fa13fbac758615f9a3d37075088d1cc1e1f), [`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e)]: + - @tanstack/start-server-core@1.169.43 + - @tanstack/start-plugin-core@1.171.53 + - @tanstack/router-utils@1.162.4 + - @tanstack/react-start-server@1.167.50 + - @tanstack/react-start-rsc@0.1.63 + +## 1.169.1 + +### Patch Changes + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-server-core@1.169.42 + - @tanstack/react-start-server@1.167.49 + - @tanstack/start-plugin-core@1.171.52 + - @tanstack/react-start-rsc@0.1.62 + - @tanstack/start-client-core@1.170.37 + - @tanstack/react-router@1.170.44 + - @tanstack/react-start-client@1.168.42 + +## 1.169.0 + +### Minor Changes + +- [#8696](https://github.com/TanStack/router/pull/8696) [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae) - TanStack Start is stable. To upgrade from a release candidate, follow [Migrate from the Release Candidate](https://tanstack.com/start/latest/docs/framework/react/migrate-from-release-candidate). + +### Patch Changes + +- [#8694](https://github.com/TanStack/router/pull/8694) [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549) - Remove the deprecated `.inputValidator()` from `createServerFn` and `createMiddleware`. Use `.validator()`, which takes the same validator. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Keep streaming a page when request middleware returns a response that reads the page body, such as a copy made through a wrapped global `Response`, a copy in Bun, or a body piped through a transform. Start now disposes a replaced page stream only when nothing reads it. `transferResponseBodyOwnership` is removed: return the derived response directly. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Remove the built-in `useSession` API. Applications choose a session library, such as iron-session, and save or destroy sessions explicitly before returning or redirecting. Connect a cookie adapter through `getCookie` and `setCookie`, or append serialized cookies with `appendResponseHeader('set-cookie', cookie)`. Existing session cookies require a deliberate migration or signing in again with a new cookie name. + + `createServerEntry` keeps the complete callback, including custom error handling, inside the request context and converts errors that escape it. The built-in entry still converts errors automatically. Raw `createStartHandler` handlers now rethrow the original error. For custom reporting, catch inside `createServerEntry`, then rethrow for default conversion or return `handleStartError(error)` to preserve response-helper status, headers, and cookies. Return an explicit `Response` when choosing a custom error payload. + + Response helpers now apply consistently across server routes, SSR, server functions, redirects, errors, and middleware response replacements. Helper setters override returned values; cookie helpers preserve independent cookies and replace matching cookie identities. Use `appendResponseHeader('set-cookie', cookie)` when adding a serialized cookie without replacing other cookies. Changed responses receive copied headers and reuse the body stream, so applications should inspect the response returned by Start rather than relying on mutation of the original response. + +- [#8696](https://github.com/TanStack/router/pull/8696) [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae) - Require Vite 8 for Vite builds. Vite 7 is no longer supported. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f3d7ee3`](https://github.com/TanStack/router/commit/f3d7ee3374c660e0fe82a03ac580a90ed2e2fa98), [`4104b8e`](https://github.com/TanStack/router/commit/4104b8ef11498706b5059c5a915f2ae47ffbc5ba), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae), [`19524cc`](https://github.com/TanStack/router/commit/19524ccdd75870ce1db2f324518eeb3f23cc0f97)]: + - @tanstack/start-server-core@1.169.41 + - @tanstack/start-client-core@1.170.36 + - @tanstack/start-plugin-core@1.171.51 + - @tanstack/react-start-server@1.167.48 + - @tanstack/react-start-rsc@0.1.61 + - @tanstack/react-router@1.170.43 + - @tanstack/react-start-client@1.168.41 + +## 1.168.61 + +### Patch Changes + +- Updated dependencies [[`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b)]: + - @tanstack/react-router@1.170.42 + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/start-server-core@1.169.40 + - @tanstack/react-start-client@1.168.40 + - @tanstack/react-start-rsc@0.1.60 + - @tanstack/react-start-server@1.167.47 + - @tanstack/start-client-core@1.170.35 + +## 1.168.60 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/start-server-core@1.169.39 + - @tanstack/react-start-client@1.168.39 + - @tanstack/react-start-rsc@0.1.59 + - @tanstack/react-start-server@1.167.46 + - @tanstack/start-client-core@1.170.34 + ## 1.168.59 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 9eb7ad03d7..6d51a4c6d0 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.59", + "version": "1.169.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -171,10 +171,10 @@ "pathe": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.0", + "@rsbuild/core": "^2.0.5", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "vite": ">=7.0.0" + "vite": ">=8.0.0" }, "peerDependenciesMeta": { "@rsbuild/core": { diff --git a/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md b/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md index d59292bc4b..81b020713b 100644 --- a/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md +++ b/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md @@ -432,5 +432,5 @@ export const myAction = createServerFn({ method: 'POST' }) ## Cross-References - [react-start](../../react-start/SKILL.md) — full React Start setup -- [start-core/server-functions](../../../../start-client-core/skills/start-core/server-functions/SKILL.md) — server function patterns -- [start-core/execution-model](../../../../start-client-core/skills/start-core/execution-model/SKILL.md) — isomorphic execution +- `@tanstack/start-client-core#start-core/server-functions` — server function patterns +- `@tanstack/start-client-core#start-core/execution-model` — isomorphic execution diff --git a/packages/react-start/skills/react-start/SKILL.md b/packages/react-start/skills/react-start/SKILL.md index b0f69009e1..988373f107 100644 --- a/packages/react-start/skills/react-start/SKILL.md +++ b/packages/react-start/skills/react-start/SKILL.md @@ -291,6 +291,6 @@ Without `` in the root route's ``, client JavaScript doesn't lo ## Cross-References -- [start-core](../../../start-client-core/skills/start-core/SKILL.md) — core Start concepts -- [router-core](../../../router-core/skills/router-core/SKILL.md) — routing fundamentals -- [react-router](../../../react-router/skills/react-router/SKILL.md) — React Router hooks and components +- `@tanstack/start-client-core#start-core` — core Start concepts +- `@tanstack/router-core#router-core` — routing fundamentals +- `@tanstack/react-router#react-router` — React Router hooks and components diff --git a/packages/react-start/skills/react-start/server-components/SKILL.md b/packages/react-start/skills/react-start/server-components/SKILL.md index 1d0b0b099f..81561824a0 100644 --- a/packages/react-start/skills/react-start/server-components/SKILL.md +++ b/packages/react-start/skills/react-start/server-components/SKILL.md @@ -74,10 +74,10 @@ Treat TanStack Start RSCs as fetchable React Flight payloads, not as a framework - Simple server fragment in a route loader -> `renderServerComponent` - Interactive slot inside server markup -> `createCompositeComponent` -- Route component needs browser APIs but loader can still prefetch on the server -> `ssr: 'data-only'` +- Route component needs browser APIs but loader can still query on the server -> `ssr: 'data-only'` - Loader itself needs browser APIs -> `ssr: false` - Route cache key must include search params -> `loaderDeps` -- Query-managed RSC -> `useSuspenseQuery` + SSR `ensureQueryData` +- Query-managed RSC -> `useSuspenseQuery` + SSR `query` with `staleTime: 'static'` - Multiple independent RSCs -> separate server functions + `Promise.all` - Multiple RSCs sharing data or invalidating together -> one server function returning many renderables or sources - Need isolated widget failures or staggered reveal -> return promises from the loader and resolve with `use()` inside Suspense diff --git a/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md b/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md index 6619f78942..f48ba02d5b 100644 --- a/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md +++ b/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md @@ -73,10 +73,13 @@ const postQueryOptions = (postId: string) => ({ }) ``` -For SSR reuse, prefetch in the route loader: +For SSR reuse, run a static query in the route loader so cached data is reused without a stale refetch: ```tsx -await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) +await context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', +}) ``` Then read it with `useSuspenseQuery` in the component. diff --git a/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx b/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx index f22b481035..d891e2230d 100644 --- a/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx +++ b/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx @@ -1,5 +1,5 @@ // Query-owned RSC pattern. -// Assumes your router context provides a queryClient for SSR prefetch. +// Assumes your router context provides a queryClient for SSR queries. import type { ReactNode } from 'react' import { createFileRoute } from '@tanstack/react-router' @@ -68,7 +68,10 @@ const postQueryOptions = (postId: string) => ({ export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context, params }) => { - await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) + await context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', + }) }, component: PostPage, }) diff --git a/packages/react-start/src/default-entry/server.ts b/packages/react-start/src/default-entry/server.ts index 8e734a7e49..638ac3c0a6 100644 --- a/packages/react-start/src/default-entry/server.ts +++ b/packages/react-start/src/default-entry/server.ts @@ -1,6 +1,7 @@ import { createStartHandler, defaultStreamHandler, + createServerEntry as createCoreServerEntry, } from '@tanstack/react-start/server' import type { Register } from '@tanstack/react-router' import type { RequestHandler } from '@tanstack/react-start/server' @@ -10,12 +11,8 @@ const fetch = createStartHandler(defaultStreamHandler) // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core` export type ServerEntry = { fetch: RequestHandler } -export function createServerEntry(entry: ServerEntry): ServerEntry { - return { - async fetch(...args) { - return await entry.fetch(...args) - }, - } -} +// Bind the shared request context and fallback error handling to React's Register. +export const createServerEntry: (entry: ServerEntry) => ServerEntry = + createCoreServerEntry export default createServerEntry({ fetch }) diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 0a24b5eee7..67101c3e51 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,67 @@ # @tanstack/router-cli +## 1.168.0 + +### Minor Changes + +- [#8855](https://github.com/TanStack/router/pull/8855) [`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6) - Require Node `^20.19.0 || >=22.12.0` (was `>=20.19`), so the CommonJS builds can load ESM-only dependencies through `require(esm)`. Node 21 and Node 22.0–22.11 do not enable it by default, so they are no longer supported. + +### Patch Changes + +- Updated dependencies [[`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ad5b3b7`](https://github.com/TanStack/router/commit/ad5b3b7a0990eed7351d672ea6695d341108e0d6)]: + - @tanstack/router-generator@1.168.0 + +## 1.167.46 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.46 + +## 1.167.45 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.45 + +## 1.167.44 + +### Patch Changes + +- [#8711](https://github.com/TanStack/router/pull/8711) [`a80cd74`](https://github.com/TanStack/router/commit/a80cd7410591396aa203f754c34caff2628f21fd) - Replace `yargs` with the dependency-free `cac` for parsing `tsr` arguments. `tsr generate` and `tsr watch` work as before. Running `tsr` with no command now prints help, and unknown commands, unknown options, or extra arguments now print an error and exit with code 1 instead of being ignored. + +- Updated dependencies []: + - @tanstack/router-generator@1.167.44 + +## 1.167.43 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.43 + +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`57bd1a9`](https://github.com/TanStack/router/commit/57bd1a92f9839af5bf773c3b36d039569fb1a41e)]: + - @tanstack/router-generator@1.167.42 + +## 1.167.41 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.41 + +## 1.167.40 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.40 + ## 1.167.39 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 6b933f813c..51a729d79b 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.39", + "version": "1.168.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -63,16 +63,15 @@ "bin/**" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@tanstack/router-generator": "workspace:*", - "chokidar": "catalog:", - "yargs": "^17.7.2" + "cac": "^7.1.0", + "chokidar": "catalog:" }, "devDependencies": { "@types/node": ">=20", - "@types/yargs": "^17.0.33", "vite": "catalog:", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", diff --git a/packages/router-cli/src/index.ts b/packages/router-cli/src/index.ts index eca5a9ff0e..7610fde457 100644 --- a/packages/router-cli/src/index.ts +++ b/packages/router-cli/src/index.ts @@ -1,25 +1,51 @@ -import yargs from 'yargs' -import { hideBin } from 'yargs/helpers' +import { cac } from 'cac' import { getConfig } from '@tanstack/router-generator' import { generate } from './generate' import { watch } from './watch' +declare const __TSR_VERSION__: string + main() export function main() { - yargs(hideBin(process.argv)) - .scriptName('tsr') - .usage('$0 [args]') - .command('generate', 'Generate the routes for a project', async () => { + const cli = cac('tsr') + + cli + .command('generate', 'Generate the routes for a project') + .action(async () => { const config = getConfig() await generate(config, process.cwd()) }) + + cli .command( 'watch', 'Continuously watch and generate the routes for a project', - () => { - watch(process.cwd()) - }, ) - .help().argv + .action(() => { + watch(process.cwd()) + }) + + cli.help() + cli.version(__TSR_VERSION__) + + try { + cli.parse() + } catch (err) { + // cac throws `CACError` for invalid usage (unknown option, extra args) + if (err instanceof Error && err.name === 'CACError') { + console.error(err.message) + process.exit(1) + } + throw err + } + + if (!cli.matchedCommand && !cli.options.help && !cli.options.version) { + // `tsr` and `tsr help` print help; unknown commands also exit with 1 + if (cli.args.length && cli.args[0] !== 'help') { + console.error(`Unknown command: ${cli.args.join(' ')}\n`) + process.exitCode = 1 + } + cli.outputHelp() + } } diff --git a/packages/router-cli/vite.config.ts b/packages/router-cli/vite.config.ts index f418b4e943..0eac9e6ed4 100644 --- a/packages/router-cli/vite.config.ts +++ b/packages/router-cli/vite.config.ts @@ -1,7 +1,12 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' +import packageJson from './package.json' -const config = defineConfig({}) +const config = defineConfig({ + define: { + __TSR_VERSION__: JSON.stringify(packageJson.version), + }, +}) export default mergeConfig( config, diff --git a/packages/router-core/AGENTS.md b/packages/router-core/AGENTS.md index b6f0e66911..7402f0bdfe 100644 --- a/packages/router-core/AGENTS.md +++ b/packages/router-core/AGENTS.md @@ -8,5 +8,5 @@ - Backpressure tests are excluded from normal unit runs. For buffering/backpressure changes, run the gated suite below. Its memory case requires exposed GC; bypass Nx cache so a previous run with the gate disabled cannot count as validation. ```sh -RUN_BACKPRESSURE_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache --skipNxCache -- tests/transformStreamBackpressure.perf.test.ts --pool=forks --execArgv=--expose-gc +RUN_BACKPRESSURE_PERF=1 CI=1 NX_DAEMON=false pnpm nx run-many -p @tanstack/router-core -t test:unit --skipRemoteCache --skipNxCache -- tests/transformStreamBackpressure.perf.test.ts --pool=forks --execArgv=--expose-gc ``` diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 48adb2a91a..b01991e223 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,52 @@ # @tanstack/router-core +## 1.171.39 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +## 1.171.38 + +### Patch Changes + +- [#8212](https://github.com/TanStack/router/pull/8212) [`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031) - Render generated script preloads (`modulepreload`, or `preload as="script"` for IIFE output) with `fetchPriority="low"` and forward it into static Early Hints, so they no longer compete with render-blocking stylesheets, fonts and images. + +## 1.171.37 + +### Patch Changes + +- [#8441](https://github.com/TanStack/router/pull/8441) [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82) - Reuse the parsed request location during SSR instead of repeating input rewrites. Match server routes against the app router's parsed pathname while preserving encoded pathnames for server handlers and middleware. + +## 1.171.36 + +### Patch Changes + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Reduce per-request work in Start: `getNormalizedURL` reads a `URL` input without cloning it, and `runWithStartContext` returns the callback's own result instead of wrapping it in a promise, so a synchronous throw from the callback now propagates synchronously. + +## 1.171.35 + +### Patch Changes + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Drop a duplicated current-location flag and a redundant `createHref` wrapper. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Use `slice` instead of `substring` where the bounds are always ordered and non-negative. + +- [#7654](https://github.com/TanStack/router/pull/7654) [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e) - Encode slashes in dehydrated SSR match IDs with `#` instead of a null byte, so the inlined hydration payload no longer contains U+0000 (which is invalid in HTML and rejected by markup validators) + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2)]: + - @tanstack/history@1.162.5 + +## 1.171.34 + +### Patch Changes + +- [#8573](https://github.com/TanStack/router/pull/8573) [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb) - Align server function request and response handling. + ## 1.171.33 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index b8ae269b9e..ed2b794278 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.33", + "version": "1.171.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -188,7 +188,7 @@ "seroval-plugins": "^1.6.7" }, "devDependencies": { - "@tanstack/store": "^0.11.0", + "@tanstack/store": "^0.11.2", "@types/node": "25.0.9", "esbuild": "^0.27.4", "vite": "catalog:", diff --git a/packages/router-core/skills/router-core/auth-and-guards/SKILL.md b/packages/router-core/skills/router-core/auth-and-guards/SKILL.md index 71a87a2a3e..4d1a6a3b6e 100644 --- a/packages/router-core/skills/router-core/auth-and-guards/SKILL.md +++ b/packages/router-core/skills/router-core/auth-and-guards/SKILL.md @@ -21,7 +21,7 @@ sources: # Auth and Guards -> **This skill covers the routing side of auth.** Route guards are UX and navigation control; the data/API boundary still belongs in the server function, server route, or API endpoint that reads or mutates private data. For the **server-side primitives** — session cookies (`HttpOnly`/`Secure`/`SameSite`), `useSession`-style helpers, OAuth `state` + PKCE, password-reset enumeration defense, CSRF, rate limiting — see [start-core/auth-server-primitives](../../../../start-client-core/skills/start-core/auth-server-primitives/SKILL.md). +> **This skill covers the routing side of auth.** Route guards are UX and navigation control; the data/API boundary still belongs in the server function, server route, or API endpoint that reads or mutates private data. For the **server-side primitives** — session cookies (`HttpOnly`/`Secure`/`SameSite`), external session helpers, OAuth `state` + PKCE, password-reset enumeration defense, CSRF, rate limiting — see `@tanstack/start-client-core#start-core/auth-server-primitives`. > > **CRITICAL**: A route guard (`beforeLoad`) does NOT protect a `createServerFn` declared on that route. Server functions are API endpoints reachable independently of the route that calls them. See "Route guards do not protect server functions" below. @@ -408,7 +408,7 @@ const getMyOrders = createServerFn({ method: 'GET' }) }) ``` -Rule of thumb: every `createServerFn`, server route, or API endpoint that touches user data needs `authMiddleware` (or an equivalent in-handler check). The route guard is for the page experience; the endpoint guard is for the data. See [start-core/auth-server-primitives](../../../../start-client-core/skills/start-core/auth-server-primitives/SKILL.md) for the full session/middleware pattern. +Rule of thumb: every `createServerFn`, server route, or API endpoint that touches user data needs `authMiddleware` (or an equivalent in-handler check). The route guard is for the page experience; the endpoint guard is for the data. See `@tanstack/start-client-core#start-core/auth-server-primitives` for the full session/middleware pattern. ### CRITICAL: The anonymous destination can still disclose protected data diff --git a/packages/router-core/skills/router-core/ssr/SKILL.md b/packages/router-core/skills/router-core/ssr/SKILL.md index d1e0524f13..752fb837a5 100644 --- a/packages/router-core/skills/router-core/ssr/SKILL.md +++ b/packages/router-core/skills/router-core/ssr/SKILL.md @@ -489,4 +489,4 @@ See [router-core/data-loading](../data-loading/SKILL.md) for loader fundamentals ## Cross-References - [router-core/data-loading](../data-loading/SKILL.md) — SSR changes where loaders execute -- [compositions/router-query](../../../../react-router/skills/compositions/router-query/SKILL.md) — SSR dehydration/hydration with TanStack Query +- `@tanstack/react-router#compositions/router-query` — SSR dehydration/hydration with TanStack Query diff --git a/packages/router-core/skills/router-core/type-safety/SKILL.md b/packages/router-core/skills/router-core/type-safety/SKILL.md index ce9204677e..15b9d35770 100644 --- a/packages/router-core/skills/router-core/type-safety/SKILL.md +++ b/packages/router-core/skills/router-core/type-safety/SKILL.md @@ -230,17 +230,17 @@ With file-based routing the route tree is generated, so this is handled for you. When using external caches like TanStack Query, don't let the router infer complex return types you never consume: ```tsx -// SLOWER — TS infers the full ensureQueryData return type into the route tree +// SLOWER — TS infers the full query return type into the route tree export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.ensureQueryData(postQueryOptions(postId)), + queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), component: PostComponent, }) -// FASTER — void return, inference stays out of the route tree +// FASTER — async loader returns no query data, inference stays out of the route tree export const Route = createFileRoute('/posts/$postId')({ - loader: async ({ context: { queryClient }, params: { postId } }) => { - await queryClient.ensureQueryData(postQueryOptions(postId)) + loader: async ({ context: { queryClient }, params: { postId: id } }) => { + await queryClient.query({ ...postQueryOptions(id), staleTime: 'static' }) }, component: PostComponent, }) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 9d0e0e8b07..9206ef60dd 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -103,7 +103,11 @@ export { resolveManifestCssLink, } from './manifest' export { isMatch } from './Matches' -export { _getAssetMatches, _getRenderedMatches } from './load-client' +export { + _getAssetMatches, + _getRenderedMatches, + _isRouteDeparting, +} from './load-client' export { composeSsrBodyScripts, getSsrBodyScriptParts } from './ssr/bodyScripts' export type { AnyMatchAndValue, diff --git a/packages/router-core/src/load-client.ts b/packages/router-core/src/load-client.ts index ea4f270447..e84bb8fba5 100644 --- a/packages/router-core/src/load-client.ts +++ b/packages/router-core/src/load-client.ts @@ -7,7 +7,7 @@ import { lifecycleEnd, runRouteLifecycle, } from './router' -import { hydrateSsrMatchId } from './ssr/ssr-match-id' +import { dehydrateSsrMatchId } from './ssr/ssr-match-id' import type { GLOBAL_SEROVAL, GLOBAL_TSR } from './ssr/constants' import type { TsrSsrGlobal } from './ssr/types' import type { ParsedLocation } from './location' @@ -116,6 +116,28 @@ export function _getRenderedMatches( return end && end < matches.length ? matches.slice(0, end) : matches } +/** + * Truthy when the transaction publishing `location` leaves `routeId` out of its + * matches, so subscribers scoped to that route can skip the publication: the + * route unmounts when the transaction commits, and a transaction that ends + * otherwise is superseded or redirected by a newer publication. Only valid + * synchronously inside the publication: the transaction's matches are emptied + * at commit and before following a redirect. Publications without a matching + * transaction (hydration) and scopes without a route never depart. + */ +export function _isRouteDeparting( + router: AnyRouter, + routeId: string | undefined, + location: ParsedLocation, +): unknown { + const tx = router._tx + return ( + routeId && + tx?.[2 /* location */] === location && + !tx[3 /* matches */].some((match) => match.routeId === routeId) + ) +} + /** Return the lane whose document assets belong to the current presentation. */ export function _getAssetMatches( matches: Array, @@ -2294,10 +2316,7 @@ export async function hydrate(router: AnyRouter): Promise { for (let index = 0; index < shared; index++) { const candidate = candidates[index]! const dehydrated = dehydratedMatches[index]! - if ( - typeof dehydrated.i !== 'string' || - hydrateSsrMatchId(dehydrated.i) !== candidate.id - ) { + if (dehydrated.i !== dehydrateSsrMatchId(candidate.id)) { pendingBoundary ??= index break } diff --git a/packages/router-core/src/load-server.ts b/packages/router-core/src/load-server.ts index aff9e11d26..325f8d63f7 100644 --- a/packages/router-core/src/load-server.ts +++ b/packages/router-core/src/load-server.ts @@ -904,7 +904,9 @@ export async function loadServerRoute( router: AnyRouter, opts?: ServerLoadOptions, ): Promise { - router.updateLatestLocation() + if (!opts?._skipLocationUpdate) { + router.updateLatestLocation() + } const next = router.latestLocation const previous = router._committed const previousEnd = router._lifecycleEnd diff --git a/packages/router-core/src/manifest.ts b/packages/router-core/src/manifest.ts index aca4b96eac..b43f485236 100644 --- a/packages/router-core/src/manifest.ts +++ b/packages/router-core/src/manifest.ts @@ -43,6 +43,7 @@ export function getScriptPreloadAttrs( rel: 'modulepreload' | 'preload' as?: 'script' href: string + fetchPriority: 'low' crossOrigin?: AssetCrossOrigin } { const preloadLink = resolveManifestAssetLink(link) @@ -54,6 +55,7 @@ export function getScriptPreloadAttrs( ? { rel: 'preload', as: 'script' } : { rel: 'modulepreload' }), href: preloadLink.href, + fetchPriority: 'low', ...(crossOrigin ? { crossOrigin } : {}), } } diff --git a/packages/router-core/src/new-process-route-tree.ts b/packages/router-core/src/new-process-route-tree.ts index df1e224e82..fd63889df2 100644 --- a/packages/router-core/src/new-process-route-tree.ts +++ b/packages/router-core/src/new-process-route-tree.ts @@ -60,11 +60,11 @@ export function parseSegment( /** The next slash, or the length of the path. */ end: number, ): InterpolationSegment { - const part = path.substring(start, end) + const part = path.slice(start, end) if (part.charCodeAt(0) === 36) { return part.length === 1 ? [SEGMENT_TYPE_WILDCARD, '_splat', '', undefined] - : [SEGMENT_TYPE_PARAM, part.substring(1), '', ''] + : [SEGMENT_TYPE_PARAM, part.slice(1), '', ''] } const open = part.indexOf('{') if (open >= 0) { @@ -76,7 +76,7 @@ export function parseSegment( part.charCodeAt(nameStart - 1) === 36 && (!optional || nameStart < close) ) { - const key = part.substring(nameStart, close) + const key = part.slice(nameStart, close) return [ optional ? SEGMENT_TYPE_OPTIONAL_PARAM @@ -84,8 +84,8 @@ export function parseSegment( ? SEGMENT_TYPE_PARAM : SEGMENT_TYPE_WILDCARD, key || '_splat', - part.substring(0, open), - path.substring(start + close + 1, key ? end : path.length), + part.slice(0, open), + path.slice(start + close + 1, key ? end : path.length), ] } } @@ -193,7 +193,7 @@ export function parseSegments( if (interpolation && literalStart < end) { // Retain original spelling before matcher case folding. if (literalStart < start - 1) { - interpolation.push(path.substring(literalStart, start - 1)) + interpolation.push(path.slice(literalStart, start - 1)) } segment[2 /* prefix */] = '/' + prefix if ( @@ -253,7 +253,7 @@ export function parseSegments( } if (interpolation && literalStart < literalEnd) { - interpolation.push(path.substring(literalStart, literalEnd)) + interpolation.push(path.slice(literalStart, literalEnd)) } // Discard push()'s spare capacity before retaining this array on both owners. const segmentData = interpolation?.slice() diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index a70df71652..ecf443168d 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -788,6 +788,8 @@ export type LoadFn = (opts?: { sync?: boolean action?: { type: HistoryAction } _signal?: AbortSignal + /** @private Reuse the location already prepared for this SSR request. */ + _skipLocationUpdate?: boolean }) => Promise export type CommitLocationFn = ({ @@ -1914,9 +1916,10 @@ export class RouterCore< } } - // We allow the caller to override the current location + // We allow the caller to override the current location. Masks build + // from the same location as the destination they mask. const currentLocation = - dest._fromLocation || this._pendingLocation || this.latestLocation + opts._fromLocation || this._pendingLocation || this.latestLocation // Value-affecting reads of the current location go through these two. // The lightweight match (fullPath, search, params without full match @@ -1926,10 +1929,8 @@ export class RouterCore< usedCurrent = true return currentLocation } - const currentMatch = () => { - usedCurrent = true - return (lightweight ??= this.matchRoutesLightweight(currentLocation)) - } + const currentMatch = () => + (lightweight ??= this.matchRoutesLightweight(current())) // check that from path exists in the current route tree // do this check only on navigations during test or development @@ -2206,13 +2207,10 @@ export class RouterCore< } } - // Masked locations stay out: `opts.mask` is rebuilt from the current location. - if ( - !(isServer ?? this.isServer) && - !usedCurrent && - opts._fromLocation && - !next.maskedLocation - ) { + // A mask that reads the current location marks the whole result through + // `usedCurrent`. Route masks belong to the route tree and options, whose + // updates replace the cache. + if (!(isServer ?? this.isServer) && !usedCurrent && opts._fromLocation) { this.staticLocations!.set(opts, next) } diff --git a/packages/router-core/src/searchParams.ts b/packages/router-core/src/searchParams.ts index 926e4e53dd..19155586e8 100644 --- a/packages/router-core/src/searchParams.ts +++ b/packages/router-core/src/searchParams.ts @@ -27,7 +27,7 @@ export function parseSearchWith(parser: (str: string) => any) { const isJsonParser = parser === JSON.parse return (searchStr: string): AnySchema => { if (searchStr[0] === '?') { - searchStr = searchStr.substring(1) + searchStr = searchStr.slice(1) } const query: Record = decode(searchStr) diff --git a/packages/router-core/src/ssr/createRequestHandler.ts b/packages/router-core/src/ssr/createRequestHandler.ts index e3297730d0..21e48ca242 100644 --- a/packages/router-core/src/ssr/createRequestHandler.ts +++ b/packages/router-core/src/ssr/createRequestHandler.ts @@ -72,6 +72,7 @@ export function createRequestHandler({ await router.load({ _signal: signal, + _skipLocationUpdate: true, }) signal.throwIfAborted() diff --git a/packages/router-core/src/ssr/handlerCallback.ts b/packages/router-core/src/ssr/handlerCallback.ts index c64f5c0d0c..45f3255c5b 100644 --- a/packages/router-core/src/ssr/handlerCallback.ts +++ b/packages/router-core/src/ssr/handlerCallback.ts @@ -14,20 +14,38 @@ export type SsrResponse = export type HandlerCallbackResult = Response | SsrResponse export function isSsrResponse(value: unknown): value is SsrResponse { + if ( + typeof value !== 'object' || + value === null || + !('response' in value) || + !(value.response instanceof Response) || + !('serverSsrCleanup' in value) + ) { + return false + } + + if (value.serverSsrCleanup === 'none') { + return true + } + return ( - typeof value === 'object' && - value !== null && - 'response' in value && - 'serverSsrCleanup' in value + value.serverSsrCleanup === 'stream' && + 'dispose' in value && + typeof value.dispose === 'function' ) } export function normalizeSsrResponse( result: HandlerCallbackResult, ): SsrResponse { - return isSsrResponse(result) - ? result - : { response: result, serverSsrCleanup: 'none' } + if (result instanceof Response) { + return { response: result, serverSsrCleanup: 'none' } + } + if (isSsrResponse(result)) { + return result + } + + throw new TypeError('Expected a Response from the SSR handler') } function cancelResponseBody(response: Response, reason?: unknown): void { diff --git a/packages/router-core/src/ssr/ssr-match-id.ts b/packages/router-core/src/ssr/ssr-match-id.ts index 6c7e2e9eaf..1c725374ec 100644 --- a/packages/router-core/src/ssr/ssr-match-id.ts +++ b/packages/router-core/src/ssr/ssr-match-id.ts @@ -1,16 +1,9 @@ +// Inlined match ids must not look like relative URLs to crawlers, and must only +// contain characters that are valid in the HTML input stream. '#' cannot come +// from a decoded pathname or an encoded param, Seroval emits it unescaped, and +// it keeps the HTML one-byte: a single char above U+00FF makes V8 widen the +// whole concatenated HTML string to two bytes per char, which slows SSR. +// The client compares ids in this encoded form, so no decoder is needed. export function dehydrateSsrMatchId(id: string): string { - return id - .replaceAll('~', '~~') - .replaceAll('\0', '~0') - .replaceAll('\uFFFD', '~r') - .replaceAll('/', '\0') -} - -export function hydrateSsrMatchId(id: string): string { - return id - .replaceAll('\0', '/') - .replaceAll('\uFFFD', '/') - .replace(/~([~0r])/g, (_, code) => - code === '0' ? '\0' : code === 'r' ? '\uFFFD' : code, - ) + return id.replaceAll('/', '#') } diff --git a/packages/router-core/src/ssr/ssr-server.ts b/packages/router-core/src/ssr/ssr-server.ts index 496e17a912..e7c9cc2fa6 100644 --- a/packages/router-core/src/ssr/ssr-server.ts +++ b/packages/router-core/src/ssr/ssr-server.ts @@ -673,12 +673,10 @@ export function getOrigin(request: Request) { // new URLSearchParams() encodes "|" while new URL() does not, and in this instance // chromium treats search params differently than paths, i.e. "|" is not encoded in search params. export function getNormalizedURL(url: string | URL, base?: string | URL) { - // ensure backslashes are encoded correctly in the URL - if (typeof url === 'string') { - url = url.replace('\\', '%5C') - } - - const rawUrl = new URL(url, base) + // Encode backslashes in a string URL. A URL object is already parsed and is + // only read here. + const rawUrl = + typeof url === 'string' ? new URL(url.replace('\\', '%5C'), base) : url // URL parsing has already handled backslashes and ignored controls. A pathname // like "//evil.example" would become a protocol-relative URL when rebuilt below. const handledProtocolRelativeURL = rawUrl.pathname.startsWith('//') diff --git a/packages/router-core/tests/build-location.bench.ts b/packages/router-core/tests/build-location.bench.ts index b6162aafef..2b93731d2c 100644 --- a/packages/router-core/tests/build-location.bench.ts +++ b/packages/router-core/tests/build-location.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, retainSearchParams } from '../src' import { createTestRouter } from './routerTestUtils' @@ -75,20 +75,23 @@ function defineCase( expect(router.buildLocation(dest as any).href).toBe(expectedHref(index)) }) let checksum = 0 - bench( - name, - () => { - checksum = publication(router, dests) - }, - { + test(name, async ({ bench }) => { + await bench( + name, + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + checksum = publication(router, dests) + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) } describe(`buildLocation per publication (${LINKS} links)`, () => { diff --git a/packages/router-core/tests/cache-commit.bench.ts b/packages/router-core/tests/cache-commit.bench.ts index 221836aa29..d570e55bf2 100644 --- a/packages/router-core/tests/cache-commit.bench.ts +++ b/packages/router-core/tests/cache-commit.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { commitMatches } from '../src/load-client' import type { AnyRouteMatch, AnyRouter } from '../src' import type { LoaderFlight, LoadTransaction } from '../src/load-client' @@ -99,15 +99,21 @@ for (const family of ['snapshots', 'mixed flights', 'preload flights']) { } } const batch = size <= 100 ? 100 : 1 - bench( - `${retainedFraction * 100}% retained (${batch} commits)`, - () => { - for (let index = 0; index < batch; index++) { - run() - } - }, - { time: 500, warmupTime: 100 }, - ) + test(`${retainedFraction * 100}% retained (${batch} commits)`, async ({ + bench, + }) => { + await bench( + `${retainedFraction * 100}% retained (${batch} commits)`, + () => { + for (let index = 0; index < batch; index++) { + run() + } + }, + ).run({ + time: 500, + warmupTime: 100, + }) + }) } }, ) diff --git a/packages/router-core/tests/cache-navigation.bench.ts b/packages/router-core/tests/cache-navigation.bench.ts index 16650d7c4b..053aa645ac 100644 --- a/packages/router-core/tests/cache-navigation.bench.ts +++ b/packages/router-core/tests/cache-navigation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -42,9 +42,11 @@ for (const size of [0, 100, 1000, 5000]) { expect(router._cache.size).toBe(size) expect(router.state.location.pathname).toBe('/') describe(`${size} cached preloads`, () => { - bench('two unrelated navigations', navigate, { - time: 1000, - warmupTime: 200, + test('two unrelated navigations', async ({ bench }) => { + await bench('two unrelated navigations', navigate).run({ + time: 1000, + warmupTime: 200, + }) }) }) } diff --git a/packages/router-core/tests/closing-tag-detection.bench.ts b/packages/router-core/tests/closing-tag-detection.bench.ts index 5a52f6c580..641c016bb4 100644 --- a/packages/router-core/tests/closing-tag-detection.bench.ts +++ b/packages/router-core/tests/closing-tag-detection.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' const BODY_END_TAG = '' const MIN_CLOSING_TAG_LENGTH = 4 @@ -680,204 +680,284 @@ verifyBodyImplementations() describe('Closing Tag Detection - Small Chunk (~70 chars)', () => { const chunk = generateSmallChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Medium Chunk (~1.5KB)', () => { const chunk = generateMediumChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Large Chunk (~13KB)', () => { const chunk = generateLargeChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Web Components', () => { const chunk = generateWebComponentChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - No Closing Tags (worst case for regex)', () => { const chunk = generateNoClosingTagChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Nested React-like Structure', () => { const chunk = generateNestedChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Partial Chunk (streaming edge case)', () => { const chunk = generatePartialChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) function benchBodyEndTagDetection(name: string, chunk: string) { describe(`Body End Tag Detection - ${name}`, () => { - bench('forward charCodeAt', () => { - findBodyEndTagForward(chunk) + test('forward charCodeAt', async ({ bench }) => { + await bench('forward charCodeAt', () => { + findBodyEndTagForward(chunk) + }).run() }) - bench('backward charCodeAt', () => { - findBodyEndTagBackward(chunk) + test('backward charCodeAt', async ({ bench }) => { + await bench('backward charCodeAt', () => { + findBodyEndTagBackward(chunk) + }).run() }) - bench('lastIndexOf( { - findBodyEndTagLastOpenSlash(chunk) + test('lastIndexOf( { + await bench('lastIndexOf( { + findBodyEndTagLastOpenSlash(chunk) + }).run() }) - bench('native lowercase + lastIndexOf( { - findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + test('native lowercase + lastIndexOf( { + await bench('native lowercase + lastIndexOf( { + findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + }).run() }) - bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk).bodyEndIndex + test('combined boundary scan', async ({ bench }) => { + await bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk).bodyEndIndex + }).run() }) }) } function benchBoundaryDetection(name: string, chunk: string) { describe(`HTML Boundary Detection - ${name}`, () => { - bench('current two-step forward body + last closing', () => { - const bodyEndIndex = findBodyEndTagForward(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('current two-step forward body + last closing', async ({ bench }) => { + await bench('current two-step forward body + last closing', () => { + const bodyEndIndex = findBodyEndTagForward(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('lastIndexOf( { - const bodyEndIndex = findBodyEndTagLastOpenSlash(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('lastIndexOf( { + await bench('lastIndexOf( { + const bodyEndIndex = findBodyEndTagLastOpenSlash(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('native lowercase body + last closing', () => { - const bodyEndIndex = findBodyEndTagNativeLowerThenLastOpenSlash(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('native lowercase body + last closing', async ({ bench }) => { + await bench('native lowercase body + last closing', () => { + const bodyEndIndex = findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('fused lastIndexOf( { - findHtmlBoundaryLastOpenSlash(chunk) + test('fused lastIndexOf( { + await bench('fused lastIndexOf( { + findHtmlBoundaryLastOpenSlash(chunk) + }).run() }) - bench('lazy fused lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazy(chunk) + test('lazy fused lastIndexOf( { + await bench('lazy fused lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazy(chunk) + }).run() }) - bench('lazy encoded lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) + test('lazy encoded lastIndexOf( { + await bench('lazy encoded lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) + }).run() }) - bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk) + test('combined boundary scan', async ({ bench }) => { + await bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk) + }).run() }) }) } diff --git a/packages/router-core/tests/deep-equal.bench.ts b/packages/router-core/tests/deep-equal.bench.ts index 2b2e788e16..c796add1ac 100644 --- a/packages/router-core/tests/deep-equal.bench.ts +++ b/packages/router-core/tests/deep-equal.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { deepEqual } from '../src/utils' // Workloads modeled on the router's callers: Link inline-option stabilization @@ -79,104 +79,87 @@ for (let index = 0; index < linkOptions.length; index++) { describe('deepEqual', () => { const options = { time: 1000, warmupTime: 200 } - bench( - 'equal flat search record (default)', - () => { + test('equal flat search record (default)', async ({ bench }) => { + await bench('equal flat search record (default)', () => { sink += +deepEqual(search, next(searchEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record with a shared child (default)', - () => { + test('equal flat record with a shared child (default)', async ({ bench }) => { + await bench('equal flat record with a shared child (default)', () => { sink += +deepEqual(search, shared) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record (explicitUndefined)', - () => { + test('equal flat record (explicitUndefined)', async ({ bench }) => { + await bench('equal flat record (explicitUndefined)', () => { sink += +deepEqual(search, next(searchEqual), false, true) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record (partial)', - () => { + test('equal flat record (partial)', async ({ bench }) => { + await bench('equal flat record (partial)', () => { sink += +deepEqual(search, next(searchEqual), true) - }, - options, - ) + }).run(options) + }) - bench( - 'late mismatch in a nested array (default)', - () => { + test('late mismatch in a nested array (default)', async ({ bench }) => { + await bench('late mismatch in a nested array (default)', () => { sink += +deepEqual(search, next(searchChangedLate)) - }, - options, - ) + }).run(options) + }) - bench( - 'early mismatch (default)', - () => { + test('early mismatch (default)', async ({ bench }) => { + await bench('early mismatch (default)', () => { sink += +deepEqual(search, next(searchChangedEarly)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal nested record (default)', - () => { + test('equal nested record (default)', async ({ bench }) => { + await bench('equal nested record (default)', () => { sink += +deepEqual(nested, next(nestedEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal array of 32 numbers', - () => { + test('equal array of 32 numbers', async ({ bench }) => { + await bench('equal array of 32 numbers', () => { sink += +deepEqual(numbers, next(numbersEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'fresh equal flat record (explicitUndefined)', - () => { + test('fresh equal flat record (explicitUndefined)', async ({ bench }) => { + await bench('fresh equal flat record (explicitUndefined)', () => { sink += +deepEqual( search, { page: 1, sort: 'asc', filter: 'open', tags: search.tags }, false, true, ) - }, - options, - ) + }).run(options) + }) - bench( - 'fresh partial mismatch', - () => { + test('fresh partial mismatch', async ({ bench }) => { + await bench('fresh partial mismatch', () => { sink += +deepEqual(search, { page: 1, sort: 'desc' }, true) - }, - options, - ) + }).run(options) + }) - bench( - 'link option stabilization: 100 entries x 3 equal values', - () => { - for (let index = 0; index < linkOptions.length; index++) { - const previous = linkOptions[index]! - const incoming = linkOptionsEqual[index]! - for (let slot = 0; slot < 3; slot++) { - sink += +deepEqual(previous[slot], incoming[slot], false, true) + test('link option stabilization: 100 entries x 3 equal values', async ({ + bench, + }) => { + await bench( + 'link option stabilization: 100 entries x 3 equal values', + () => { + for (let index = 0; index < linkOptions.length; index++) { + const previous = linkOptions[index]! + const incoming = linkOptionsEqual[index]! + for (let slot = 0; slot < 3; slot++) { + sink += +deepEqual(previous[slot], incoming[slot], false, true) + } } - } - }, - options, - ) + }, + ).run(options) + }) }) // Keep the results observable so the comparisons cannot be optimized away. diff --git a/packages/router-core/tests/fallback-route-lifecycle.bench.ts b/packages/router-core/tests/fallback-route-lifecycle.bench.ts index 5542aee292..16468d473e 100644 --- a/packages/router-core/tests/fallback-route-lifecycle.bench.ts +++ b/packages/router-core/tests/fallback-route-lifecycle.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { lifecycleEnd, runRouteLifecycle } from '../src/router' import type { AnyRouteMatch, AnyRouter, AnyRoute } from '../src' import type { LoadTransaction } from '../src/load-client' @@ -191,16 +191,16 @@ for (const depth of [1, 2, 3, 4, 5, 6]) { ['original', originalLifecycle], ['candidate', candidateLifecycle], ] as const) { - bench( - name, - () => { + test(name, async ({ bench }) => { + await bench(name, () => { for (let i = 0; i < 100; i++) { router._lifecycleEnd = previousEnd run(router, previous, matches, owner) } - }, - { time: 300 }, - ) + }).run({ + time: 300, + }) + }) } }) } diff --git a/packages/router-core/tests/getNormalizedURL.test.ts b/packages/router-core/tests/getNormalizedURL.test.ts index f07316fe55..89cca987b7 100644 --- a/packages/router-core/tests/getNormalizedURL.test.ts +++ b/packages/router-core/tests/getNormalizedURL.test.ts @@ -2,6 +2,21 @@ import { describe, expect, test } from 'vitest' import { getNormalizedURL } from '../src/ssr/ssr-server' describe('getNormalizedURL', () => { + test('returns an independent URL that callers can modify', () => { + const input = new URL('https://example.com/path?query=value') + const { url } = getNormalizedURL(input) + url.pathname = '/changed' + expect(input.href).toBe('https://example.com/path?query=value') + }) + + test.each([ + 'https://user:password@example.com/path', + 'https://example.com/path?', + 'https://example.com/path#', + ])('normalizes the full URL consistently: %s', (input) => { + expect(getNormalizedURL(input).url.href).toBe('https://example.com/path') + }) + test.each(['/%2Fdocs', '/%5Cdocs', '/%00/docs'])( 'preserves encoded pathname data in a URL object: %s', (pathname) => { diff --git a/packages/router-core/tests/history-normalization.test.ts b/packages/router-core/tests/history-normalization.test.ts index 3d0bf8fbbc..b862a35b7d 100644 --- a/packages/router-core/tests/history-normalization.test.ts +++ b/packages/router-core/tests/history-normalization.test.ts @@ -190,4 +190,26 @@ describe('history normalization boundaries', () => { } }, ) + + test('reads a hash route that starts with a query once', async () => { + window.history.replaceState(null, '', '/shell#?x=1') + const history = createHashHistory() + try { + const root = new BaseRootRoute() + const index = new BaseRoute({ getParentRoute: () => root, path: '/' }) + const router = createTestRouter({ + routeTree: root.addChildren([index]), + history, + isServer: false, + }) + await router.load() + expect(router.state.location.search).toEqual({ x: 1 }) + // The query must not also be read as part of the pathname. + expect(router.state.location.href).toMatch(/^\/?\?x=1$/) + expect(router.state.matches.at(-1)?.routeId).toBe(index.id) + } finally { + history.destroy() + window.history.replaceState(null, '', '/') + } + }) }) diff --git a/packages/router-core/tests/hydrate.test.ts b/packages/router-core/tests/hydrate.test.ts index 4f03568963..37685b48ef 100644 --- a/packages/router-core/tests/hydrate.test.ts +++ b/packages/router-core/tests/hydrate.test.ts @@ -10,6 +10,7 @@ import { } from '../src' import { hydrate } from '../src/ssr/client' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { AnyRouteMatch, AnyRouter, LocationRewrite } from '../src' import type { ServerManifest } from '../src/manifest' @@ -188,6 +189,40 @@ describe('hydrate', () => { expect(clientLoader).not.toHaveBeenCalled() }) + it('inlines match ids that are valid HTML and not path-like', async () => { + const rootRoute = new BaseRootRoute({}) + const productRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/products/$productId', + loader: () => 'product', + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([productRoute]), + history: createMemoryHistory({ initialEntries: ['/products/42'] }), + isServer: true, + }) + attachRouterServerSsrUtils({ router, manifest: testManifest }) + + try { + await router.load() + await router.serverSsr!.dehydrate() + const html = router + .serverSsr!.takeInitialHydrationScriptTags()! + .before.map((script) => script.children) + .join('') + + // Control characters other than whitespace are parse errors in the HTML + // input stream. + // eslint-disable-next-line no-control-regex + expect(html).not.toMatch(/[\x00-\x08\x0b\x0e-\x1f\x7f-\x9f]/) + // A char above U+00FF would widen the whole HTML string to two bytes. + expect(html).not.toMatch(/[\u0100-\uffff]/) + expect(html).not.toContain('/products/42') + } finally { + router.serverSsr?.cleanup() + } + }) + it('restores undefined loader data without serializing it', async () => { const serverRootRoute = new BaseRootRoute({}) const serverRoute = new BaseRoute({ diff --git a/packages/router-core/tests/hydrationQueue.bench.ts b/packages/router-core/tests/hydrationQueue.bench.ts index 821cbeb5ad..04679b3c5c 100644 --- a/packages/router-core/tests/hydrationQueue.bench.ts +++ b/packages/router-core/tests/hydrationQueue.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' const MAX_DYNAMIC_RECORD_CODE_UNITS = 64 * 1024 const SOURCE_SEPARATOR = ';' @@ -93,11 +93,15 @@ if ( } describe('maximum hydration source queue with 4 KiB sources', () => { - bench('front splice', () => { - return void (benchmarkSink = drainWithSplice(sources.slice())) + test('front splice', async ({ bench }) => { + await bench('front splice', () => { + return void (benchmarkSink = drainWithSplice(sources.slice())) + }).run() }) - bench('head index with compaction', () => { - return void (benchmarkSink = drainWithHead(sources.slice())) + test('head index with compaction', async ({ bench }) => { + await bench('head index with compaction', () => { + return void (benchmarkSink = drainWithHead(sources.slice())) + }).run() }) }) diff --git a/packages/router-core/tests/lightweight-location.bench.ts b/packages/router-core/tests/lightweight-location.bench.ts index 2470f40cc1..44f70c9d53 100644 --- a/packages/router-core/tests/lightweight-location.bench.ts +++ b/packages/router-core/tests/lightweight-location.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -46,13 +46,20 @@ describe.each([false, true])( } run() expect(checksum).toBe(iterations * '/target'.length) - bench(`${count} source params`, run, { - time: 1000, - warmupTime: 200, - throws: true, - teardown: () => { - expect(checksum).toBe(iterations * '/target'.length) - }, + test(`${count} source params`, async ({ bench }) => { + await bench( + `${count} source params`, + { + afterAll: () => { + expect(checksum).toBe(iterations * '/target'.length) + }, + }, + run, + ).run({ + time: 1000, + warmupTime: 200, + throws: true, + }) }) } }, diff --git a/packages/router-core/tests/mask.test.ts b/packages/router-core/tests/mask.test.ts index 3791206dd7..3722aa6a1b 100644 --- a/packages/router-core/tests/mask.test.ts +++ b/packages/router-core/tests/mask.test.ts @@ -645,3 +645,201 @@ describe('buildLocation - route masks', () => { ) }) }) + +describe('buildLocation - masks and _fromLocation', () => { + test.each(['mask', 'routeMasks'] as const)( + 'the %s location builds from _fromLocation like the destination', + async (kind) => { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + const photoRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photo', + }) + const routeTree = rootRoute.addChildren([postsRoute, photoRoute]) + const router = createTestRouter({ + routeTree, + history: createMemoryHistory({ + initialEntries: ['/posts?page=1#live'], + }), + routeMasks: + kind === 'routeMasks' + ? [ + { + routeTree: null as any, + from: '/photo', + to: '.', + search: true, + hash: true, + }, + ] + : undefined, + }) + await router.load() + const held = router.buildLocation({ + to: '/posts', + search: { page: 5 }, + hash: 'held', + }) + + const location = router.buildLocation({ + to: '/photo', + search: true, + mask: + kind === 'mask' ? { to: '.', search: true, hash: true } : undefined, + _fromLocation: held, + } as any) + + expect(location.href).toBe('/photo?page=5') + expect(location.maskedLocation?.href).toBe('/posts?page=5#held') + }, + ) +}) + +describe('buildLocation - masked locations and the static location cache', () => { + const setup = (routeMasks?: Array>) => { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + const photoRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photo', + }) + const photosRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photos/$photoId', + }) + const routeTree = rootRoute.addChildren([ + postsRoute, + photoRoute, + photosRoute, + ]) + const router = createTestRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/posts'] }), + routeMasks, + }) + // Two sources a Link can display, as the router builds them. + const sources = [1, 2].map((n) => + router.buildLocation({ + to: '/photos/$photoId', + params: { photoId: `${n}` }, + search: { page: n }, + hash: n === 1 ? 'one' : 'two', + state: { n } as any, + }), + ) + // Builds one options object from each source in turn, the way a Link + // rebuilds its destination when its displayed location changes. + const buildFromEachSource = (opts: Record) => + sources.map((source) => + router.buildLocation( + Object.assign(opts, { _fromLocation: source }) as any, + ), + ) + return { router, routeTree, buildFromEachSource } + } + + test('reuses the location of a fixed mask across sources', () => { + const { buildFromEachSource } = setup() + const [first, second] = buildFromEachSource({ + to: '/photo', + search: { id: 1 }, + mask: { to: '/posts', search: { from: 'photo' } }, + }) + expect(first!.maskedLocation!.href).toBe('/posts?from=photo') + expect(second).toBe(first) + }) + + test('reuses the location of a fixed route mask across sources', () => { + const { buildFromEachSource } = setup([ + { routeTree: null as any, from: '/photo', to: '/posts' }, + ]) + const [first, second] = buildFromEachSource({ to: '/photo' }) + expect(first!.maskedLocation!.href).toBe('/posts') + expect(second).toBe(first) + }) + + test.each([ + ['a relative target', { to: '.' }, ['/photos/1', '/photos/2']], + [ + 'inherited params', + { to: '/photos/$photoId' }, + ['/photos/1', '/photos/2'], + ], + [ + 'the current search', + { to: '/posts', search: true }, + ['/posts?page=1', '/posts?page=2'], + ], + [ + 'a search updater', + { to: '/posts', search: (prev: any) => ({ p: prev.page }) }, + ['/posts?p=1', '/posts?p=2'], + ], + [ + 'the current hash', + { to: '/posts', hash: true }, + ['/posts#one', '/posts#two'], + ], + ] as const)( + 'rebuilds a mask that reads %s for each source', + (_, mask, expected) => { + const { buildFromEachSource } = setup() + const locations = buildFromEachSource({ to: '/photo', mask }) + expect(locations[1]).not.toBe(locations[0]) + expect( + locations.map((location) => location.maskedLocation!.href), + ).toEqual(expected) + }, + ) + + test('rebuilds a mask that reads the current state for each source', () => { + const { buildFromEachSource } = setup() + const locations = buildFromEachSource({ + to: '/photo', + mask: { to: '/posts', state: true }, + }) + expect(locations[1]).not.toBe(locations[0]) + expect( + locations.map((location) => (location.maskedLocation!.state as any).n), + ).toEqual([1, 2]) + }) + + test('rebuilds a route mask that reads the current location for each source', () => { + const { buildFromEachSource } = setup([ + { + routeTree: null as any, + from: '/photo', + to: '/posts', + search: true, + hash: true, + }, + ]) + const locations = buildFromEachSource({ to: '/photo' }) + expect(locations[1]).not.toBe(locations[0]) + expect(locations.map((location) => location.maskedLocation!.href)).toEqual([ + '/posts?page=1#one', + '/posts?page=2#two', + ]) + }) + + test('drops a cached route mask when the router is updated', () => { + const { router, buildFromEachSource } = setup([ + { routeTree: null as any, from: '/photo', to: '/posts' }, + ]) + const opts = { to: '/photo' } + const [first] = buildFromEachSource(opts) + expect(first!.maskedLocation!.href).toBe('/posts') + + router.update({ ...router.options, routeMasks: undefined }) + const [afterUpdate] = buildFromEachSource(opts) + expect(afterUpdate).not.toBe(first) + expect(afterUpdate!.maskedLocation).toBeUndefined() + }) +}) diff --git a/packages/router-core/tests/matching-interpolation.bench.ts b/packages/router-core/tests/matching-interpolation.bench.ts index f86cd0b87e..03fe060bfa 100644 --- a/packages/router-core/tests/matching-interpolation.bench.ts +++ b/packages/router-core/tests/matching-interpolation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -95,25 +95,26 @@ for (const server of [false, true]) { } } let checksum = 0 - bench( - scenario.name, - () => { - let length = 0 - for (const path of scenario.paths) { - for (const match of router.matchRoutes(path, {}, options)) { - length += - match.id.length + Object.keys(match._strictParams).length + test(scenario.name, async ({ bench }) => { + await bench( + scenario.name, + { afterAll: () => expect(checksum).toBe(expected) }, + () => { + let length = 0 + for (const path of scenario.paths) { + for (const match of router.matchRoutes(path, {}, options)) { + length += + match.id.length + Object.keys(match._strictParams).length + } } - } - checksum = length - }, - { + checksum = length + }, + ).run({ time: 1000, warmupTime: 300, throws: true, - teardown: () => expect(checksum).toBe(expected), - }, - ) + }) + }) } }) } diff --git a/packages/router-core/tests/new-process-route-tree.test.ts b/packages/router-core/tests/new-process-route-tree.test.ts index 3a1db0338d..86a7c4e659 100644 --- a/packages/router-core/tests/new-process-route-tree.test.ts +++ b/packages/router-core/tests/new-process-route-tree.test.ts @@ -1961,7 +1961,7 @@ describe('findRouteMatch', () => { }) }) -describe('processRouteMasks', { sequential: true }, () => { +describe('processRouteMasks', { concurrent: false }, () => { const routeTree = { id: '__root__', isRoot: true, diff --git a/packages/router-core/tests/path-decoder.bench.ts b/packages/router-core/tests/path-decoder.bench.ts index 23060b33be..4c56a8aa76 100644 --- a/packages/router-core/tests/path-decoder.bench.ts +++ b/packages/router-core/tests/path-decoder.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -51,11 +51,16 @@ describe.each(['stable', 'new-router', 'no-update'] as const)( } run() verify() - bench('update and build 200 locations', run, { - time: 1500, - warmupTime: 500, - throws: true, - teardown: verify, + test('update and build 200 locations', async ({ bench }) => { + await bench( + 'update and build 200 locations', + { afterAll: verify }, + run, + ).run({ + time: 1500, + warmupTime: 500, + throws: true, + }) }) }, ) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 53498b5198..80d3478594 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory, normalizeProtocolRelative, @@ -203,79 +203,88 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { : parseSegments(false, { fullPath: input.path }, 0), })) - bench( - 'interpolation and normalization batch', - () => { - let length = 0 - for (const call of calls) { - length += canonicalPathname(call.path, call.params, call.route).length - } - checksum = length - }, - { + test('interpolation and normalization batch', async ({ bench }) => { + await bench( + 'interpolation and normalization batch', + { + afterAll: () => { + expect(checksum).toBe(cachedExpected) + }, + }, + () => { + let length = 0 + for (const call of calls) { + length += canonicalPathname(call.path, call.params, call.route).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(cachedExpected) - }, - }, - ) + }) + }) - bench( - 'prepared pathname interpolation batch', - () => { - let length = 0 - for (const input of preparedInputs) { - length += ( - input.segments - ? interpolatePath( - input.path, - input.segments, - input.params, - input.decoder, - ) - : input.path - ).length - } - checksum = length - }, - { + test('prepared pathname interpolation batch', async ({ bench }) => { + await bench( + 'prepared pathname interpolation batch', + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + let length = 0 + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + ) + : input.path + ).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) - bench( - 'prepared metadata interpolation batch', - () => { - let length = 0 - for (const input of preparedInputs) { - length += ( - input.segments - ? interpolatePath( - input.path, - input.segments, - input.params, - input.decoder, - Object.create(null), - ) - : input.path - ).length - } - checksum = length - }, - { + test('prepared metadata interpolation batch', async ({ bench }) => { + await bench( + 'prepared metadata interpolation batch', + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + let length = 0 + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + Object.create(null), + ) + : input.path + ).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) }) diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index 86639cb26d..044fbe38bc 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createNull, deepEqual, @@ -199,213 +199,303 @@ const iterations = 1_000 let sink: unknown describe('isPlainObject', () => { - bench('literal', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(search) - } + test('literal', async ({ bench }) => { + await bench('literal', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(search) + } + }).run() }) - bench('null-proto record', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(emptyNull) - } + test('null-proto record', async ({ bench }) => { + await bench('null-proto record', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(emptyNull) + } + }).run() }) - bench('null-proto record with a constructor key', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(searchWithConstructorKey) - } + test('null-proto record with a constructor key', async ({ bench }) => { + await bench('null-proto record with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(searchWithConstructorKey) + } + }).run() }) - bench('class instance', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(instance) - } + test('class instance', async ({ bench }) => { + await bench('class instance', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(instance) + } + }).run() }) }) describe('replaceEqualDeep', () => { - bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(empty, {}) - } + test('equal empty objects', async ({ bench }) => { + await bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(empty, {}) + } + }).run() }) - bench('equal empty null-proto objects', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(emptyNull, createNull()) - } + test('equal empty null-proto objects', async ({ bench }) => { + await bench('equal empty null-proto objects', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(emptyNull, createNull()) + } + }).run() }) - bench('equal null-proto search with a constructor key', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep( - searchWithConstructorKey, - searchWithConstructorKeyCopy, - ) - } + test('equal null-proto search with a constructor key', async ({ bench }) => { + await bench('equal null-proto search with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep( + searchWithConstructorKey, + searchWithConstructorKeyCopy, + ) + } + }).run() }) - bench('equal flat search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchCopy) - } + test('equal flat search', async ({ bench }) => { + await bench('equal flat search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchCopy) + } + }).run() }) - bench('flat search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchChanged) - } + test('flat search with one changed leaf', async ({ bench }) => { + await bench('flat search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchChanged) + } + }).run() }) - bench('equal parsed null-proto search', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, nullSearchCopy) - } + test('equal parsed null-proto search', async ({ bench }) => { + await bench('equal parsed null-proto search', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchCopy) + } + }).run() }) - bench('equal ordinary search against a null-proto previous value', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, searchCopy) - } + test('equal ordinary search against a null-proto previous value', async ({ + bench, + }) => { + await bench( + 'equal ordinary search against a null-proto previous value', + () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchCopy) + } + }, + ).run() }) - bench('parsed null-proto search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, nullSearchChanged) - } + test('parsed null-proto search with one changed leaf', async ({ bench }) => { + await bench('parsed null-proto search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchChanged) + } + }).run() }) - bench('ordinary search update in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, searchChanged) - } + test('ordinary search update in null-proto mode', async ({ bench }) => { + await bench('ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchChanged) + } + }).run() }) - bench('equal ordinary search in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(search, searchCopy) - } + test('equal ordinary search in null-proto mode', async ({ bench }) => { + await bench('equal ordinary search in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchCopy) + } + }).run() }) - bench('successive ordinary search update in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(search, searchChanged) - } + test('successive ordinary search update in null-proto mode', async ({ + bench, + }) => { + await bench('successive ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchChanged) + } + }).run() }) - bench('changed selector followed by the same incoming reference', () => { - for (let i = 0; i < iterations; i++) { - const current = replaceEqualDeep(search, searchChanged) - sink = replaceEqualDeep(current, searchChanged) - } + test('changed selector followed by the same incoming reference', async ({ + bench, + }) => { + await bench( + 'changed selector followed by the same incoming reference', + () => { + for (let i = 0; i < iterations; i++) { + const current = replaceEqualDeep(search, searchChanged) + sink = replaceEqualDeep(current, searchChanged) + } + }, + ).run() }) - bench('equal record with decimal values', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(decimalRecord, decimalRecordCopy) - } + test('equal record with decimal values', async ({ bench }) => { + await bench('equal record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordCopy) + } + }).run() }) - bench('changed record with decimal values', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(decimalRecord, decimalRecordChanged) - } + test('changed record with decimal values', async ({ bench }) => { + await bench('changed record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordChanged) + } + }).run() }) - bench('equal nested search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(nested, nestedCopy) - } + test('equal nested search', async ({ bench }) => { + await bench('equal nested search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedCopy) + } + }).run() }) - bench('nested search sharing unchanged subtrees', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(nested, nestedLeafChanged) - } + test('nested search sharing unchanged subtrees', async ({ bench }) => { + await bench('nested search sharing unchanged subtrees', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedLeafChanged) + } + }).run() }) - bench('nested search sharing unchanged subtrees in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nested, nestedLeafChanged) - } + test('nested search sharing unchanged subtrees in null-proto mode', async ({ + bench, + }) => { + await bench( + 'nested search sharing unchanged subtrees in null-proto mode', + () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nested, nestedLeafChanged) + } + }, + ).run() }) - bench('equal array of objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listCopy) - } + test('equal array of objects', async ({ bench }) => { + await bench('equal array of objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listCopy) + } + }).run() }) - bench('array of objects with one changed item', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listChanged) - } + test('array of objects with one changed item', async ({ bench }) => { + await bench('array of objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listChanged) + } + }).run() }) - bench('wide flat object with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wide, wideChanged) - } + test('wide flat object with one changed leaf', async ({ bench }) => { + await bench('wide flat object with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wide, wideChanged) + } + }).run() }) - bench('wide flat object with one changed leaf (null-proto)', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(wide, wideChanged) - } + test('wide flat object with one changed leaf (null-proto)', async ({ + bench, + }) => { + await bench('wide flat object with one changed leaf (null-proto)', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(wide, wideChanged) + } + }).run() }) - bench('flat search with all leaves changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchAllChanged) - } + test('flat search with all leaves changed', async ({ bench }) => { + await bench('flat search with all leaves changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchAllChanged) + } + }).run() }) - bench('equal flat search with reordered keys', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchReordered) - } + test('equal flat search with reordered keys', async ({ bench }) => { + await bench('equal flat search with reordered keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchReordered) + } + }).run() }) - bench('flat search with a key removed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchSubset) - } + test('flat search with a key removed', async ({ bench }) => { + await bench('flat search with a key removed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchSubset) + } + }).run() }) - bench('array of shared objects with one changed item', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listShared) - } + test('array of shared objects with one changed item', async ({ bench }) => { + await bench('array of shared objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listShared) + } + }).run() }) - bench('wider flat object (64 keys) with the last leaf changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wider, widerChangedLast) - } + test('wider flat object (64 keys) with the last leaf changed', async ({ + bench, + }) => { + await bench( + 'wider flat object (64 keys) with the last leaf changed', + () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, widerChangedLast) + } + }, + ).run() }) - bench('flat object growing from 8 to 64 keys', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(widerSubset, wider) - } + test('flat object growing from 8 to 64 keys', async ({ bench }) => { + await bench('flat object growing from 8 to 64 keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(widerSubset, wider) + } + }).run() }) for (const [name, next] of [ ['first leaf changed', widerChangedFirst], ['all leaves changed', widerAllChanged], ] as const) { - bench(`wider flat object (64 keys) with ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wider, next) - } + test(`wider flat object (64 keys) with ${name}`, async ({ bench }) => { + await bench(`wider flat object (64 keys) with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, next) + } + }).run() }) } - bench('equal long array of shared objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(longList, longListCopy) - } + test('equal long array of shared objects', async ({ bench }) => { + await bench('equal long array of shared objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, longListCopy) + } + }).run() }) for (const [name, next] of [ @@ -413,10 +503,17 @@ describe('replaceEqualDeep', () => { ['changed', longListChangedLast], ['changed after a cloned but equal item', longListClonedThenChanged], ] as const) { - bench(`long array of shared objects with the last item ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(longList, next) - } + test(`long array of shared objects with the last item ${name}`, async ({ + bench, + }) => { + await bench( + `long array of shared objects with the last item ${name}`, + () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, next) + } + }, + ).run() }) } @@ -424,23 +521,29 @@ describe('replaceEqualDeep', () => { const prev = Array.from({ length }, (_, index) => index) const next = [...prev] expect(replaceEqualDeep(prev, next)).toBe(prev) - bench(`equal primitive array of length ${length}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(prev, next) - } + test(`equal primitive array of length ${length}`, async ({ bench }) => { + await bench(`equal primitive array of length ${length}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }).run() }) } - bench('equal long primitive array', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, numbersCopy) - } + test('equal long primitive array', async ({ bench }) => { + await bench('equal long primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersCopy) + } + }).run() }) - bench('long primitive array with the last item changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, numbersChangedLast) - } + test('long primitive array with the last item changed', async ({ bench }) => { + await bench('long primitive array with the last item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersChangedLast) + } + }).run() }) for (const [name, next] of [ @@ -450,88 +553,112 @@ describe('replaceEqualDeep', () => { ['shortened', numbersShorter], ['appended undefined values', numbersLonger], ] as const) { - bench(`long primitive array with ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, next) - } + test(`long primitive array with ${name}`, async ({ bench }) => { + await bench(`long primitive array with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, next) + } + }).run() }) } - bench('small primitive array with the first item changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(smallNumbers, smallNumbersChanged) - } + test('small primitive array with the first item changed', async ({ + bench, + }) => { + await bench('small primitive array with the first item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(smallNumbers, smallNumbersChanged) + } + }).run() }) - bench('mixed search and array updates', () => { - for (let i = 0; i < iterations; i++) { - const [prev, next] = mixedPairs[i % mixedPairs.length]! - sink = replaceEqualDeep(prev, next) - } + test('mixed search and array updates', async ({ bench }) => { + await bench('mixed search and array updates', () => { + for (let i = 0; i < iterations; i++) { + const [prev, next] = mixedPairs[i % mixedPairs.length]! + sink = replaceEqualDeep(prev, next) + } + }).run() }) for (const { name, prev, next } of numericResults) { - bench(`long ${name} array with the last item changed`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(prev, next) - } + test(`long ${name} array with the last item changed`, async ({ bench }) => { + await bench(`long ${name} array with the last item changed`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }).run() }) } }) describe('consume structurally shared arrays', () => { - bench('sum changed primitive array by index', () => { - for (let i = 0; i < iterations; i++) { - let sum = 0 - for (let j = 0; j < consumedNumbers.length; j++) { - sum += consumedNumbers[j]! - } - sink = sum - } - }) - - bench('reduce changed primitive array', () => { - for (let i = 0; i < iterations; i++) { - sink = consumedNumbers.reduce((sum, value) => sum + value, 0) - } - }) - - for (const { name, result } of numericResults) { - bench(`sum changed ${name} array by index`, () => { + test('sum changed primitive array by index', async ({ bench }) => { + await bench('sum changed primitive array by index', () => { for (let i = 0; i < iterations; i++) { let sum = 0 - for (let j = 0; j < result.length; j++) { - sum += result[j]! + for (let j = 0; j < consumedNumbers.length; j++) { + sum += consumedNumbers[j]! } sink = sum } + }).run() + }) + + test('reduce changed primitive array', async ({ bench }) => { + await bench('reduce changed primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = consumedNumbers.reduce((sum, value) => sum + value, 0) + } + }).run() + }) + + for (const { name, result } of numericResults) { + test(`sum changed ${name} array by index`, async ({ bench }) => { + await bench(`sum changed ${name} array by index`, () => { + for (let i = 0; i < iterations; i++) { + let sum = 0 + for (let j = 0; j < result.length; j++) { + sum += result[j]! + } + sink = sum + } + }).run() }) - bench(`reduce changed ${name} array`, () => { - for (let i = 0; i < iterations; i++) { - sink = result.reduce((sum, value) => sum + value, 0) - } + test(`reduce changed ${name} array`, async ({ bench }) => { + await bench(`reduce changed ${name} array`, () => { + for (let i = 0; i < iterations; i++) { + sink = result.reduce((sum, value) => sum + value, 0) + } + }).run() }) } }) describe('deepEqual', () => { - bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(empty, {}) - } + test('equal empty objects', async ({ bench }) => { + await bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(empty, {}) + } + }).run() }) - bench('equal flat search (partial)', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(search, searchCopy, true) - } + test('equal flat search (partial)', async ({ bench }) => { + await bench('equal flat search (partial)', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(search, searchCopy, true) + } + }).run() }) - bench('nested search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(nested, nestedLeafChanged) - } + test('nested search with one changed leaf', async ({ bench }) => { + await bench('nested search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(nested, nestedLeafChanged) + } + }).run() }) }) diff --git a/packages/router-core/tests/rewrite.bench.ts b/packages/router-core/tests/rewrite.bench.ts index 0ccf78cb82..1f7b88d610 100644 --- a/packages/router-core/tests/rewrite.bench.ts +++ b/packages/router-core/tests/rewrite.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute } from '../src' import { @@ -89,50 +89,59 @@ describe.each([ url = executeRewriteOutput(rewrite, url) expect(url.href).toBe('https://example.com/app/public?sort=name#title') - bench( - `${name} round trip`, - () => { - // Reuse the round-trip URL so URL construction does not hide the - // composition cost for callbacks that mutate or leave it unchanged. - for (let index = 0; index < 64; index++) { - url = executeRewriteOutput(rewrite, executeRewriteInput(rewrite, url)) - } - }, - { + test(`${name} round trip`, async ({ bench }) => { + await bench( + `${name} round trip`, + { + afterAll: () => { + expect(url.href).toBe( + 'https://example.com/app/public?sort=name#title', + ) + }, + }, + () => { + // Reuse the round-trip URL so URL construction does not hide the + // composition cost for callbacks that mutate or leave it unchanged. + for (let index = 0; index < 64; index++) { + url = executeRewriteOutput( + rewrite, + executeRewriteInput(rewrite, url), + ) + } + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(url.href).toBe( - 'https://example.com/app/public?sort=name#title', - ) - }, - }, - ) + }) + }) } let trailingSlash = false - bench( - 'router update rebuilding the rewrite', - () => { - if (custom) { - router.update({ rewrite: { ...custom } }) - } else { - trailingSlash = !trailingSlash - router.update({ basepath: trailingSlash ? '/app/' : '/app' }) - } - }, - { + test('router update rebuilding the rewrite', async ({ bench }) => { + await bench( + 'router update rebuilding the rewrite', + { + afterAll: () => { + expect(router.latestLocation.pathname).toBe( + unchanged ? '/public' : '/internal', + ) + }, + }, + () => { + if (custom) { + router.update({ rewrite: { ...custom } }) + } else { + trailingSlash = !trailingSlash + router.update({ basepath: trailingSlash ? '/app/' : '/app' }) + } + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(router.latestLocation.pathname).toBe( - unchanged ? '/public' : '/internal', - ) - }, - }, - ) + }) + }) }) describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { @@ -152,17 +161,20 @@ describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { expect(router.rewrite).toBe(rewrite) expect(router.latestLocation.pathname).toBe('/public') - bench( - 'router update without rebuilding the rewrite', - () => router.update({}), - { + test('router update without rebuilding the rewrite', async ({ bench }) => { + await bench( + 'router update without rebuilding the rewrite', + { + afterAll: () => { + expect(router.rewrite).toBe(rewrite) + expect(router.latestLocation.pathname).toBe('/public') + }, + }, + () => router.update({}), + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(router.rewrite).toBe(rewrite) - expect(router.latestLocation.pathname).toBe('/public') - }, - }, - ) + }) + }) }) diff --git a/packages/router-core/tests/route-tree-construction.bench.ts b/packages/router-core/tests/route-tree-construction.bench.ts index 6d564d9e84..e567f06d36 100644 --- a/packages/router-core/tests/route-tree-construction.bench.ts +++ b/packages/router-core/tests/route-tree-construction.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { BaseRootRoute, BaseRoute } from '../src' import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' import type { AnyRoute } from '../src' @@ -62,37 +62,42 @@ for (const count of [100, 1000, 10000]) { } verify() - bench( - 'processRouteTree + route.init on fresh objects', - () => { - result = processRouteTree(tree) - }, - { - setup: (task) => { - // Vitest forwards Bench options, not per-iteration Task options. - task.opts.beforeEach = () => { + test('processRouteTree + route.init on fresh objects', async ({ + bench, + }) => { + await bench( + 'processRouteTree + route.init on fresh objects', + { + beforeEach: () => { tree = createTree(count, shape) - } + }, + afterAll: verify, }, - teardown: verify, + () => { + result = processRouteTree(tree) + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - }, - ) + }) + }) - bench( - 'route objects + processRouteTree + route.init', - () => { - result = processRouteTree(createTree(count, shape)) - }, - { - teardown: verify, + test('route objects + processRouteTree + route.init', async ({ + bench, + }) => { + await bench( + 'route objects + processRouteTree + route.init', + { afterAll: verify }, + () => { + result = processRouteTree(createTree(count, shape)) + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - }, - ) + }) + }) }, ) } diff --git a/packages/router-core/tests/searchParams-parse.bench.ts b/packages/router-core/tests/searchParams-parse.bench.ts index ff94dcb99e..79f7e3e5ac 100644 --- a/packages/router-core/tests/searchParams-parse.bench.ts +++ b/packages/router-core/tests/searchParams-parse.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { defaultParseSearch, parseSearchWith } from '../src' const iterations = 1_000 @@ -184,60 +184,96 @@ const searches = Object.fromEntries( ) describe('default search parsing', () => { - bench('ordinary string values', () => { - parseBatch(searches.ordinaryStrings!) + test('ordinary string values', async ({ bench }) => { + await bench('ordinary string values', () => { + parseBatch(searches.ordinaryStrings!) + }).run() }) - bench('ordinary strings outside JSON-literal initials', () => { - parseBatch(searches.nonLiteralInitialStrings!) + test('ordinary strings outside JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings outside JSON-literal initials', () => { + parseBatch(searches.nonLiteralInitialStrings!) + }).run() }) - bench('ordinary strings with JSON-literal initials', () => { - parseBatch(searches.jsonInitialStrings!) + test('ordinary strings with JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings with JSON-literal initials', () => { + parseBatch(searches.jsonInitialStrings!) + }).run() }) - bench('empty string values', () => { - parseBatch(searches.emptyStrings!) + test('empty string values', async ({ bench }) => { + await bench('empty string values', () => { + parseBatch(searches.emptyStrings!) + }).run() }) - bench('ordinary strings with non-JSON punctuation starts', () => { - parseBatch(searches.punctuationStrings!) + test('ordinary strings with non-JSON punctuation starts', async ({ + bench, + }) => { + await bench('ordinary strings with non-JSON punctuation starts', () => { + parseBatch(searches.punctuationStrings!) + }).run() }) - bench('ordinary f/n/t words outside JSON-literal prefixes', () => { - parseBatch(searches.nonLiteralPrefixStrings!) + test('ordinary f/n/t words outside JSON-literal prefixes', async ({ + bench, + }) => { + await bench('ordinary f/n/t words outside JSON-literal prefixes', () => { + parseBatch(searches.nonLiteralPrefixStrings!) + }).run() }) - bench('application words with JSON-literal prefixes', () => { - parseBatch(searches.jsonLiteralPrefixStrings!) + test('application words with JSON-literal prefixes', async ({ bench }) => { + await bench('application words with JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralPrefixStrings!) + }).run() }) - bench('application words with complete JSON-literal prefixes', () => { - parseBatch(searches.jsonLiteralWordStrings!) + test('application words with complete JSON-literal prefixes', async ({ + bench, + }) => { + await bench('application words with complete JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralWordStrings!) + }).run() }) - bench('JSON-literal prefixes followed by punctuation', () => { - parseBatch(searches.jsonLiteralBoundaryStrings!) + test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { + await bench('JSON-literal prefixes followed by punctuation', () => { + parseBatch(searches.jsonLiteralBoundaryStrings!) + }).run() }) - bench('JSON-compatible string values', () => { - parseBatch(searches.jsonStrings!) + test('JSON-compatible string values', async ({ bench }) => { + await bench('JSON-compatible string values', () => { + parseBatch(searches.jsonStrings!) + }).run() }) - bench('mixed application values', () => { - parseBatch(searches.mixedValues!) + test('mixed application values', async ({ bench }) => { + await bench('mixed application values', () => { + parseBatch(searches.mixedValues!) + }).run() }) - bench('primitives already converted by decode', () => { - parseBatch(searches.decodedPrimitives!) + test('primitives already converted by decode', async ({ bench }) => { + await bench('primitives already converted by decode', () => { + parseBatch(searches.decodedPrimitives!) + }).run() }) - bench('strings requiring JSON.parse', () => { - parseBatch(searches.parsedJson!) + test('strings requiring JSON.parse', async ({ bench }) => { + await bench('strings requiring JSON.parse', () => { + parseBatch(searches.parsedJson!) + }).run() }) - bench('JSON with leading whitespace', () => { - parseBatch(searches.whitespaceJson!) + test('JSON with leading whitespace', async ({ bench }) => { + await bench('JSON with leading whitespace', () => { + parseBatch(searches.whitespaceJson!) + }).run() }) - bench('malformed JSON retains original strings', () => { - parseBatch(searches.malformedJson!) + test('malformed JSON retains original strings', async ({ bench }) => { + await bench('malformed JSON retains original strings', () => { + parseBatch(searches.malformedJson!) + }).run() }) }) @@ -248,16 +284,20 @@ expect(customParse(searches.ordinaryStrings!)).toEqual({ category: 'HARDWARE', sort: 'NEWEST', }) -bench('custom search parser ordinary strings', () => { - parseBatch(searches.ordinaryStrings!, customParse) +test('custom search parser ordinary strings', async ({ bench }) => { + await bench('custom search parser ordinary strings', () => { + parseBatch(searches.ordinaryStrings!, customParse) + }).run() }) const throwingParse = parseSearchWith(() => { throw new Error('not parseable') }) expect(throwingParse(searches.ordinaryStrings!)).toEqual(ordinaryStrings) -bench('custom search parser rejected strings', () => { - parseBatch(searches.ordinaryStrings!, throwingParse) +test('custom search parser rejected strings', async ({ bench }) => { + await bench('custom search parser rejected strings', () => { + parseBatch(searches.ordinaryStrings!, throwingParse) + }).run() }) const encodedMixed = new URLSearchParams([ @@ -279,8 +319,10 @@ expect(defaultParseSearch(encodedMixed)).toEqual({ category: 'favorite', tag: ['one', 'two'], }) -bench('encoded mixed search with repeated keys', () => { - parseBatch(encodedMixed) +test('encoded mixed search with repeated keys', async ({ bench }) => { + await bench('encoded mixed search with repeated keys', () => { + parseBatch(encodedMixed) + }).run() }) void benchmarkSink diff --git a/packages/router-core/tests/searchParams.bench.ts b/packages/router-core/tests/searchParams.bench.ts index 35fda3060f..32d42b96fd 100644 --- a/packages/router-core/tests/searchParams.bench.ts +++ b/packages/router-core/tests/searchParams.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { defaultStringifySearch } from '../src' const iterations = 1_000 @@ -112,56 +112,88 @@ function stringifyBatch(search: Record) { } describe('default search serialization', () => { - bench('empty object', () => { - stringifyBatch({}) + test('empty object', async ({ bench }) => { + await bench('empty object', () => { + stringifyBatch({}) + }).run() }) - bench('only undefined values', () => { - stringifyBatch({ first: undefined, second: undefined }) + test('only undefined values', async ({ bench }) => { + await bench('only undefined values', () => { + stringifyBatch({ first: undefined, second: undefined }) + }).run() }) - bench('ordinary string values', () => { - stringifyBatch(ordinaryStrings) + test('ordinary string values', async ({ bench }) => { + await bench('ordinary string values', () => { + stringifyBatch(ordinaryStrings) + }).run() }) - bench('ordinary strings outside JSON-literal initials', () => { - stringifyBatch(nonLiteralInitialStrings) + test('ordinary strings outside JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings outside JSON-literal initials', () => { + stringifyBatch(nonLiteralInitialStrings) + }).run() }) - bench('ordinary strings with JSON-literal initials', () => { - stringifyBatch(jsonInitialStrings) + test('ordinary strings with JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings with JSON-literal initials', () => { + stringifyBatch(jsonInitialStrings) + }).run() }) - bench('empty string values', () => { - stringifyBatch(emptyStrings) + test('empty string values', async ({ bench }) => { + await bench('empty string values', () => { + stringifyBatch(emptyStrings) + }).run() }) - bench('ordinary strings with non-JSON punctuation starts', () => { - stringifyBatch(punctuationStrings) + test('ordinary strings with non-JSON punctuation starts', async ({ + bench, + }) => { + await bench('ordinary strings with non-JSON punctuation starts', () => { + stringifyBatch(punctuationStrings) + }).run() }) - bench('ordinary f/n/t words outside JSON-literal prefixes', () => { - stringifyBatch(nonLiteralPrefixStrings) + test('ordinary f/n/t words outside JSON-literal prefixes', async ({ + bench, + }) => { + await bench('ordinary f/n/t words outside JSON-literal prefixes', () => { + stringifyBatch(nonLiteralPrefixStrings) + }).run() }) - bench('application words with JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralPrefixStrings) + test('application words with JSON-literal prefixes', async ({ bench }) => { + await bench('application words with JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralPrefixStrings) + }).run() }) - bench('application words with complete JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralWordStrings) + test('application words with complete JSON-literal prefixes', async ({ + bench, + }) => { + await bench('application words with complete JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralWordStrings) + }).run() }) - bench('JSON-literal prefixes followed by punctuation', () => { - stringifyBatch(jsonLiteralBoundaryStrings) + test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { + await bench('JSON-literal prefixes followed by punctuation', () => { + stringifyBatch(jsonLiteralBoundaryStrings) + }).run() }) - bench('JSON-compatible string values', () => { - stringifyBatch(jsonStrings) + test('JSON-compatible string values', async ({ bench }) => { + await bench('JSON-compatible string values', () => { + stringifyBatch(jsonStrings) + }).run() }) - bench('mixed application values', () => { - stringifyBatch(mixedValues) + test('mixed application values', async ({ bench }) => { + await bench('mixed application values', () => { + stringifyBatch(mixedValues) + }).run() }) }) diff --git a/packages/router-core/tests/server-history.test.ts b/packages/router-core/tests/server-history.test.ts index 86485fbe4c..6343a08cd2 100644 --- a/packages/router-core/tests/server-history.test.ts +++ b/packages/router-core/tests/server-history.test.ts @@ -1,8 +1,142 @@ import { createMemoryHistory, createServerHistory } from '@tanstack/history' import { expect, test, vi } from 'vitest' import { BaseRootRoute, BaseRoute, redirect } from '../src' +import { createRequestHandler } from '../src/ssr/server' import { createTestRouter, loadServerResponse } from './routerTestUtils' +test.each([ + { basepath: '', origin: undefined }, + { basepath: '/app', origin: undefined }, + { basepath: '/app', origin: 'https://canonical.example' }, +])( + 'request handling rewrites once with basepath $basepath and origin $origin', + async ({ basepath, origin }) => { + const root = new BaseRootRoute() + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = url.pathname.replace('/public/', '/posts/') + return url + }) + const router = createTestRouter({ + isServer: true, + basepath, + origin, + rewrite: { + input, + output: ({ url }) => { + url.pathname = url.pathname.replace('/posts/', '/public/') + return url + }, + }, + routeTree: root.addChildren([ + new BaseRoute({ + getParentRoute: () => root, + path: '/posts/$postId', + loader: ({ params }) => params.postId, + }), + ]), + }) + input.mockClear() + + const response = await createRequestHandler({ + createRouter: () => router, + request: new Request( + `https://example.com${basepath}/public/caf%C3%A9?view=full`, + ), + })(({ router: loadedRouter }) => { + return Response.json({ + postId: loadedRouter.state.matches.at(-1)?.loaderData, + pathname: loadedRouter.state.location.pathname, + search: loadedRouter.state.location.search, + }) + }) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + postId: 'café', + pathname: '/posts/café', + search: { view: 'full' }, + }) + expect(input).toHaveBeenCalledTimes(1) + expect(input.mock.calls[0]?.[0].url.origin).toBe( + origin ?? 'https://example.com', + ) + }, +) + +test.each([ + { isServer: false, action: 'push' }, + { isServer: false, action: 'replace' }, + { isServer: true, action: 'push' }, + { isServer: true, action: 'replace' }, +] as const)( + 'loads refresh memory history after $action with isServer=$isServer by default', + async ({ isServer, action }) => { + const root = new BaseRootRoute() + const targetLoader = vi.fn(() => 'target') + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + isServer, + history, + routeTree: root.addChildren([ + new BaseRoute({ getParentRoute: () => root, path: '/' }), + new BaseRoute({ + getParentRoute: () => root, + path: '/target', + loader: targetLoader, + }), + ]), + }) + await router.load() + + history[action]('/target') + await router.load() + + expect(router.state.location.pathname).toBe('/target') + expect(targetLoader).toHaveBeenCalledTimes(1) + expect(router.state.matches.at(-1)?.loaderData).toBe('target') + }, +) + +test('server loads reuse a location prepared with updated router options', async () => { + const root = new BaseRootRoute() + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = url.pathname.replace('/public', '/target') + return url + }) + const router = createTestRouter({ + isServer: true, + basepath: '/old', + history: createMemoryHistory({ initialEntries: ['/old/'] }), + routeTree: root.addChildren([ + new BaseRoute({ getParentRoute: () => root, path: '/' }), + new BaseRoute({ + getParentRoute: () => root, + path: '/target', + loader: () => 'target', + }), + ]), + }) + router.update({ + history: createServerHistory('/app/public'), + basepath: '/app', + rewrite: { + input, + output: ({ url }) => { + url.pathname = url.pathname.replace('/target', '/public') + return url + }, + }, + }) + input.mockClear() + + await router.load({ _skipLocationUpdate: true }) + + expect(router.state.location.pathname).toBe('/target') + expect(router.state.location.publicHref).toBe('/app/public') + expect(router.state.matches.at(-1)?.loaderData).toBe('target') + expect(input).not.toHaveBeenCalled() +}) + test.each([false, true])( 'router navigation respects isServer=%s with memory history', async (isServer) => { diff --git a/packages/router-core/tests/ssr-match-id.bench.ts b/packages/router-core/tests/ssr-match-id.bench.ts index 3f6a7c0a6e..33e0bb5945 100644 --- a/packages/router-core/tests/ssr-match-id.bench.ts +++ b/packages/router-core/tests/ssr-match-id.bench.ts @@ -1,5 +1,5 @@ -import { bench, describe, expect } from 'vitest' -import { dehydrateSsrMatchId, hydrateSsrMatchId } from '../src/ssr/ssr-match-id' +import { describe, test } from 'vitest' +import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' const typicalIds = Array.from( { length: 100 }, @@ -11,42 +11,27 @@ const deepIds = Array.from( (_, index) => `${Array.from({ length: 32 }, (__, depth) => `/route-${depth}`).join('')}/${index}`, ) -const reservedIds = Array.from( - { length: 100 }, - (_, index) => `~/\0/\uFFFD/~0/~r/${index}`, -) -const normalizedDeepIds = deepIds.map((id) => - dehydrateSsrMatchId(id).replaceAll('\0', '\uFFFD'), -) let benchmarkSink = 0 -for (const id of [...typicalIds, ...deepIds, ...reservedIds]) { - expect(hydrateSsrMatchId(dehydrateSsrMatchId(id))).toBe(id) -} - describe('SSR match ID codec', () => { - bench('encode 100 typical match IDs', () => { - let size = 0 - for (const id of typicalIds) { - size += dehydrateSsrMatchId(id).length - } - benchmarkSink = size + test('encode 100 typical match IDs', async ({ bench }) => { + await bench('encode 100 typical match IDs', () => { + let size = 0 + for (const id of typicalIds) { + size += dehydrateSsrMatchId(id).length + } + benchmarkSink = size + }).run() }) - bench('decode 100 normalized deep match IDs', () => { - let size = 0 - for (const id of normalizedDeepIds) { - size += hydrateSsrMatchId(id).length - } - benchmarkSink = size - }) - - bench('round-trip 100 reserved-character match IDs', () => { - let size = 0 - for (const id of reservedIds) { - size += hydrateSsrMatchId(dehydrateSsrMatchId(id)).length - } - benchmarkSink = size + test('encode 100 deep match IDs', async ({ bench }) => { + await bench('encode 100 deep match IDs', () => { + let size = 0 + for (const id of deepIds) { + size += dehydrateSsrMatchId(id).length + } + benchmarkSink = size + }).run() }) }) diff --git a/packages/router-core/tests/ssr-match-id.test.ts b/packages/router-core/tests/ssr-match-id.test.ts index 65e1cc4ebb..221b15c3e6 100644 --- a/packages/router-core/tests/ssr-match-id.test.ts +++ b/packages/router-core/tests/ssr-match-id.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { dehydrateSsrMatchId, hydrateSsrMatchId } from '../src/ssr/ssr-match-id' +import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' describe('ssr match id codec', () => { it('removes forward slashes in dehydrated ids', () => { @@ -8,35 +8,16 @@ describe('ssr match id codec', () => { ) expect(dehydratedId).not.toContain('/') - expect(hydrateSsrMatchId(dehydratedId)).toBe( - '/$orgId/projects/$projectId//acme/projects/dashboard/{}', - ) + expect(dehydratedId).not.toContain('\0') }) it('leaves ids without slashes unchanged', () => { - const id = 'plain-id' - - expect(dehydrateSsrMatchId(id)).toBe(id) - expect(hydrateSsrMatchId(id)).toBe(id) + expect(dehydrateSsrMatchId('plain-id')).toBe('plain-id') }) - it('round-trips reserved and browser-normalized characters', () => { - const id = '~/\0/\uFFFD/~0/~r' - const dehydratedId = dehydrateSsrMatchId(id) - const normalize = (value: string) => value.replaceAll('\0', '\uFFFD') - - expect(hydrateSsrMatchId(normalize(dehydratedId))).toBe(id) - expect(normalize(dehydrateSsrMatchId('/r'))).not.toBe( - normalize(dehydrateSsrMatchId('\uFFFDr')), + it('keeps distinct slash-delimited ids distinct', () => { + expect(dehydrateSsrMatchId('/posts/1')).not.toBe( + dehydrateSsrMatchId('/posts1'), ) }) - - it('decodes browser-normalized replacement chars back to slashes', () => { - const normalized = dehydrateSsrMatchId('/posts/1').replaceAll( - '\0', - '\uFFFD', - ) - - expect(hydrateSsrMatchId(normalized)).toBe('/posts/1') - }) }) diff --git a/packages/router-devtools-core/CHANGELOG.md b/packages/router-devtools-core/CHANGELOG.md index 791c877aa9..63eb2961dd 100644 --- a/packages/router-devtools-core/CHANGELOG.md +++ b/packages/router-devtools-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/router-devtools-core +## 1.168.3 + +### Patch Changes + +- [#8888](https://github.com/TanStack/router/pull/8888) [`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0) - Fix broken styling of the embedded `TanStackRouterDevtoolsPanel` (including inside shadow DOM) by giving the devtools size tokens a `1rem` fallback when `--tsrd-font-size` is not set. + ## 1.168.2 ### Patch Changes diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 722a76e522..24db637cc7 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.168.2", + "version": "1.168.3", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/src/tokens.ts b/packages/router-devtools-core/src/tokens.ts index 9d247cf184..97ed9e4cd9 100644 --- a/packages/router-devtools-core/src/tokens.ts +++ b/packages/router-devtools-core/src/tokens.ts @@ -161,37 +161,37 @@ export const tokens = { }, font: { size: { - '2xs': 'calc(var(--tsrd-font-size) * 0.625)', - xs: 'calc(var(--tsrd-font-size) * 0.75)', - sm: 'calc(var(--tsrd-font-size) * 0.875)', - md: 'var(--tsrd-font-size)', - lg: 'calc(var(--tsrd-font-size) * 1.125)', - xl: 'calc(var(--tsrd-font-size) * 1.25)', - '2xl': 'calc(var(--tsrd-font-size) * 1.5)', - '3xl': 'calc(var(--tsrd-font-size) * 1.875)', - '4xl': 'calc(var(--tsrd-font-size) * 2.25)', - '5xl': 'calc(var(--tsrd-font-size) * 3)', - '6xl': 'calc(var(--tsrd-font-size) * 3.75)', - '7xl': 'calc(var(--tsrd-font-size) * 4.5)', - '8xl': 'calc(var(--tsrd-font-size) * 6)', - '9xl': 'calc(var(--tsrd-font-size) * 8)', + '2xs': 'calc(var(--tsrd-font-size, 1rem) * 0.625)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + md: 'var(--tsrd-font-size, 1rem)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 1.125)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 1.875)', + '4xl': 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + '5xl': 'calc(var(--tsrd-font-size, 1rem) * 3)', + '6xl': 'calc(var(--tsrd-font-size, 1rem) * 3.75)', + '7xl': 'calc(var(--tsrd-font-size, 1rem) * 4.5)', + '8xl': 'calc(var(--tsrd-font-size, 1rem) * 6)', + '9xl': 'calc(var(--tsrd-font-size, 1rem) * 8)', }, lineHeight: { - '3xs': 'calc(var(--tsrd-font-size) * 0.75)', - '2xs': 'calc(var(--tsrd-font-size) * 0.875)', - xs: 'calc(var(--tsrd-font-size) * 1)', - sm: 'calc(var(--tsrd-font-size) * 1.25)', - md: 'calc(var(--tsrd-font-size) * 1.5)', - lg: 'calc(var(--tsrd-font-size) * 1.75)', - xl: 'calc(var(--tsrd-font-size) * 2)', - '2xl': 'calc(var(--tsrd-font-size) * 2.25)', - '3xl': 'calc(var(--tsrd-font-size) * 2.5)', - '4xl': 'calc(var(--tsrd-font-size) * 2.75)', - '5xl': 'calc(var(--tsrd-font-size) * 3)', - '6xl': 'calc(var(--tsrd-font-size) * 3.25)', - '7xl': 'calc(var(--tsrd-font-size) * 3.5)', - '8xl': 'calc(var(--tsrd-font-size) * 3.75)', - '9xl': 'calc(var(--tsrd-font-size) * 4)', + '3xs': 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + '2xs': 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 1)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + md: 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 1.75)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 2)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 2.5)', + '4xl': 'calc(var(--tsrd-font-size, 1rem) * 2.75)', + '5xl': 'calc(var(--tsrd-font-size, 1rem) * 3)', + '6xl': 'calc(var(--tsrd-font-size, 1rem) * 3.25)', + '7xl': 'calc(var(--tsrd-font-size, 1rem) * 3.5)', + '8xl': 'calc(var(--tsrd-font-size, 1rem) * 3.75)', + '9xl': 'calc(var(--tsrd-font-size, 1rem) * 4)', }, weight: { thin: '100', @@ -220,55 +220,55 @@ export const tokens = { border: { radius: { none: '0px', - xs: 'calc(var(--tsrd-font-size) * 0.125)', - sm: 'calc(var(--tsrd-font-size) * 0.25)', - md: 'calc(var(--tsrd-font-size) * 0.375)', - lg: 'calc(var(--tsrd-font-size) * 0.5)', - xl: 'calc(var(--tsrd-font-size) * 0.75)', - '2xl': 'calc(var(--tsrd-font-size) * 1)', - '3xl': 'calc(var(--tsrd-font-size) * 1.5)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 0.125)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 0.25)', + md: 'calc(var(--tsrd-font-size, 1rem) * 0.375)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 0.5)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 1)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 1.5)', full: '9999px', }, }, size: { 0: '0px', - 0.25: 'calc(var(--tsrd-font-size) * 0.0625)', - 0.5: 'calc(var(--tsrd-font-size) * 0.125)', - 1: 'calc(var(--tsrd-font-size) * 0.25)', - 1.5: 'calc(var(--tsrd-font-size) * 0.375)', - 2: 'calc(var(--tsrd-font-size) * 0.5)', - 2.5: 'calc(var(--tsrd-font-size) * 0.625)', - 3: 'calc(var(--tsrd-font-size) * 0.75)', - 3.5: 'calc(var(--tsrd-font-size) * 0.875)', - 4: 'calc(var(--tsrd-font-size) * 1)', - 4.5: 'calc(var(--tsrd-font-size) * 1.125)', - 5: 'calc(var(--tsrd-font-size) * 1.25)', - 5.5: 'calc(var(--tsrd-font-size) * 1.375)', - 6: 'calc(var(--tsrd-font-size) * 1.5)', - 6.5: 'calc(var(--tsrd-font-size) * 1.625)', - 7: 'calc(var(--tsrd-font-size) * 1.75)', - 8: 'calc(var(--tsrd-font-size) * 2)', - 9: 'calc(var(--tsrd-font-size) * 2.25)', - 10: 'calc(var(--tsrd-font-size) * 2.5)', - 11: 'calc(var(--tsrd-font-size) * 2.75)', - 12: 'calc(var(--tsrd-font-size) * 3)', - 14: 'calc(var(--tsrd-font-size) * 3.5)', - 16: 'calc(var(--tsrd-font-size) * 4)', - 20: 'calc(var(--tsrd-font-size) * 5)', - 24: 'calc(var(--tsrd-font-size) * 6)', - 28: 'calc(var(--tsrd-font-size) * 7)', - 32: 'calc(var(--tsrd-font-size) * 8)', - 36: 'calc(var(--tsrd-font-size) * 9)', - 40: 'calc(var(--tsrd-font-size) * 10)', - 44: 'calc(var(--tsrd-font-size) * 11)', - 48: 'calc(var(--tsrd-font-size) * 12)', - 52: 'calc(var(--tsrd-font-size) * 13)', - 56: 'calc(var(--tsrd-font-size) * 14)', - 60: 'calc(var(--tsrd-font-size) * 15)', - 64: 'calc(var(--tsrd-font-size) * 16)', - 72: 'calc(var(--tsrd-font-size) * 18)', - 80: 'calc(var(--tsrd-font-size) * 20)', - 96: 'calc(var(--tsrd-font-size) * 24)', + 0.25: 'calc(var(--tsrd-font-size, 1rem) * 0.0625)', + 0.5: 'calc(var(--tsrd-font-size, 1rem) * 0.125)', + 1: 'calc(var(--tsrd-font-size, 1rem) * 0.25)', + 1.5: 'calc(var(--tsrd-font-size, 1rem) * 0.375)', + 2: 'calc(var(--tsrd-font-size, 1rem) * 0.5)', + 2.5: 'calc(var(--tsrd-font-size, 1rem) * 0.625)', + 3: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + 3.5: 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + 4: 'calc(var(--tsrd-font-size, 1rem) * 1)', + 4.5: 'calc(var(--tsrd-font-size, 1rem) * 1.125)', + 5: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + 5.5: 'calc(var(--tsrd-font-size, 1rem) * 1.375)', + 6: 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + 6.5: 'calc(var(--tsrd-font-size, 1rem) * 1.625)', + 7: 'calc(var(--tsrd-font-size, 1rem) * 1.75)', + 8: 'calc(var(--tsrd-font-size, 1rem) * 2)', + 9: 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + 10: 'calc(var(--tsrd-font-size, 1rem) * 2.5)', + 11: 'calc(var(--tsrd-font-size, 1rem) * 2.75)', + 12: 'calc(var(--tsrd-font-size, 1rem) * 3)', + 14: 'calc(var(--tsrd-font-size, 1rem) * 3.5)', + 16: 'calc(var(--tsrd-font-size, 1rem) * 4)', + 20: 'calc(var(--tsrd-font-size, 1rem) * 5)', + 24: 'calc(var(--tsrd-font-size, 1rem) * 6)', + 28: 'calc(var(--tsrd-font-size, 1rem) * 7)', + 32: 'calc(var(--tsrd-font-size, 1rem) * 8)', + 36: 'calc(var(--tsrd-font-size, 1rem) * 9)', + 40: 'calc(var(--tsrd-font-size, 1rem) * 10)', + 44: 'calc(var(--tsrd-font-size, 1rem) * 11)', + 48: 'calc(var(--tsrd-font-size, 1rem) * 12)', + 52: 'calc(var(--tsrd-font-size, 1rem) * 13)', + 56: 'calc(var(--tsrd-font-size, 1rem) * 14)', + 60: 'calc(var(--tsrd-font-size, 1rem) * 15)', + 64: 'calc(var(--tsrd-font-size, 1rem) * 16)', + 72: 'calc(var(--tsrd-font-size, 1rem) * 18)', + 80: 'calc(var(--tsrd-font-size, 1rem) * 20)', + 96: 'calc(var(--tsrd-font-size, 1rem) * 24)', }, shadow: { xs: (_: string = 'rgb(0 0 0 / 0.1)') => diff --git a/packages/router-devtools/CHANGELOG.md b/packages/router-devtools/CHANGELOG.md index 3ba014e38f..201d972d6c 100644 --- a/packages/router-devtools/CHANGELOG.md +++ b/packages/router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-router-devtools@1.167.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 2aa446dbab..4158b280d7 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index 418275e2db..a37550d255 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,69 @@ # @tanstack/router-generator +## 1.168.0 + +### Minor Changes + +- [#8855](https://github.com/TanStack/router/pull/8855) [`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6) - Require Node `^20.19.0 || >=22.12.0` (was `>=20.19`), so the CommonJS builds can load ESM-only dependencies through `require(esm)`. Node 21 and Node 22.0–22.11 do not enable it by default, so they are no longer supported. + +### Patch Changes + +- [#8857](https://github.com/TanStack/router/pull/8857) [`ad5b3b7`](https://github.com/TanStack/router/commit/ad5b3b7a0990eed7351d672ea6695d341108e0d6) - A pathless layout inside a route group (`routes/(group)/_layout.tsx`) or a route group's own layout (`routes/(group)/route.tsx`) is typed with the full path `'/'` in `FileRoutesByPath`, like the router gives it at runtime, instead of `''`. When no index route claims `/`, the layout also appears under `'/'` in `FileRoutesByFullPath` and `FileRoutesByTo`, as a pathless layout outside a group already does. + +- Updated dependencies [[`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69)]: + - @tanstack/router-utils@1.163.0 + +## 1.167.46 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e)]: + - @tanstack/router-utils@1.162.4 + +## 1.167.43 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + +## 1.167.42 + +### Patch Changes + +- [#8664](https://github.com/TanStack/router/pull/8664) [`57bd1a9`](https://github.com/TanStack/router/commit/57bd1a92f9839af5bf773c3b36d039569fb1a41e) - Avoid overwriting a route file with the scaffold template when an in-place save finishes while the generator is reading the file. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.167.39 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index b27ea01b5b..e62e105068 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.39", + "version": "1.168.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -62,7 +62,7 @@ "src" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@babel/types": "catalog:", diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index e8cd170e40..91f87dadda 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -1146,6 +1146,7 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved strategy: { type: 'mtime', expectedMtimeMs: updatedCacheEntry.mtimeMs, + expectedContent: existingRouteFile.fileContent, }, }) updatedCacheEntry.mtimeMs = stats.mtimeMs @@ -1206,6 +1207,9 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved | { type: 'mtime' expectedMtimeMs: bigint + // An in-place save can truncate and rewrite a file within one mtime + // tick, so user-authored files also compare the content. + expectedContent?: string } | { type: 'new-file' @@ -1215,13 +1219,8 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved await this.fs.writeFile(tmpPath, opts.newContent) if (opts.strategy.type === 'mtime') { + const { expectedMtimeMs, expectedContent } = opts.strategy const beforeStat = await this.fs.stat(opts.filePath) - if (beforeStat.mtimeMs !== opts.strategy.expectedMtimeMs) { - throw rerun({ - msg: `File ${opts.filePath} was modified by another process during processing.`, - event: { type: 'update', path: opts.filePath }, - }) - } const newFileState = await this.fs.stat(tmpPath) if (newFileState.mode !== beforeStat.mode) { await this.fs.chmod(tmpPath, beforeStat.mode) @@ -1247,6 +1246,25 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved } } } + // Check right before the rename so that changes made while the + // temporary file was prepared are not overwritten. + let changed: boolean + if (expectedContent === undefined) { + const current = await this.fs.stat(opts.filePath) + changed = current.mtimeMs !== expectedMtimeMs + } else { + const current = await this.fs.readFile(opts.filePath) + changed = + current === 'file-not-existing' || + current.stat.mtimeMs !== expectedMtimeMs || + current.fileContent !== expectedContent + } + if (changed) { + throw rerun({ + msg: `File ${opts.filePath} was modified by another process during processing.`, + event: { type: 'update', path: opts.filePath }, + }) + } } else { if (await checkFileExists(opts.filePath)) { throw rerun({ @@ -1370,6 +1388,7 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved strategy: { type: 'mtime', expectedMtimeMs: rootNodeFile.stat.mtimeMs, + expectedContent: rootNodeFile.fileContent, }, }) updatedCacheEntry.fileContent = rootRouteContent diff --git a/packages/router-generator/src/utils.ts b/packages/router-generator/src/utils.ts index 747980aa7b..a3bb4b746c 100644 --- a/packages/router-generator/src/utils.ts +++ b/packages/router-generator/src/utils.ts @@ -924,9 +924,10 @@ const inferPath = (routeNode: RouteNode): string => { } /** - * Infers the full path for use by TS + * The full path with groups and pathless segments removed. A route group's + * layout (e.g. `/(group)/_layout`) strips down to `''`. */ -export const inferFullPath = (routeNode: RouteNode): string => { +const stripFullPath = (routeNode: RouteNode): string => { const fullPath = removeGroups( removeLayoutSegmentsAndUnderscoresWithEscape( routeNode.routePath, @@ -949,6 +950,13 @@ export const inferFullPath = (routeNode: RouteNode): string => { return fullPath.replace(/\/$/, '') } +/** + * Infers the full path for use by TS + */ +export const inferFullPath = (routeNode: RouteNode): string => + // A route group's layout has the router's full path `/` + stripFullPath(routeNode) || '/' + const shouldPreferIndexRoute = ( current: RouteNode, existing: RouteNode, @@ -1112,8 +1120,12 @@ Conflicting files: \n ${emptyPathRoutes throw new Error(errorMessage) } + // A route group's layout keeps its stripped path `''` here, so one without + // child routes yet doesn't conflict with the index route. A childless + // `_auth.tsx` does: the route tree lists the index route first, and the + // router would then match `/` to the layout const routes = _routes.map((d) => { - const inferredFullPath = inferFullPath(d) + const inferredFullPath = stripFullPath(d) return { ...d, inferredFullPath } }) diff --git a/packages/router-generator/tests/childless-pathless-layout.test.ts b/packages/router-generator/tests/childless-pathless-layout.test.ts new file mode 100644 index 0000000000..caef9449bf --- /dev/null +++ b/packages/router-generator/tests/childless-pathless-layout.test.ts @@ -0,0 +1,107 @@ +import fs from 'node:fs/promises' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it, test } from 'vitest' + +import { Generator, getConfig } from '../src' + +let tempDir: string | undefined + +afterEach(async () => { + if (tempDir) { + await fs.rm(tempDir, { recursive: true, force: true }) + tempDir = undefined + } +}) + +function routeSource(id: string) { + if (id === '__root__') { + return `import { createRootRoute } from '@tanstack/react-router' + +export const Route = createRootRoute() +` + } + return `import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('${id}')() +` +} + +async function generate(files: Record) { + tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'tsr-generator-childless-layout-'), + ) + const routesDirectory = path.join(tempDir, 'routes') + for (const [file, id] of Object.entries(files)) { + const filePath = path.join(routesDirectory, file) + await fs.mkdir(path.dirname(filePath), { recursive: true }) + await fs.writeFile(filePath, routeSource(id)) + } + const generatedRouteTree = path.join(tempDir, 'routeTree.gen.ts') + const generator = new Generator({ + config: getConfig( + { + disableLogging: true, + routesDirectory, + generatedRouteTree, + tmpDir: path.join(tempDir, 'tmp'), + }, + tempDir, + ), + root: tempDir, + }) + await generator.run() + return fs.readFile(generatedRouteTree, 'utf-8') +} + +// A route group's layout without child routes yet next to the index route +// generates, as before route-group layouts were typed with the full path `/`. +describe('a route-group layout without child routes yet next to the index route', () => { + it.each([ + { file: '(group)/_layout.tsx', id: '/(group)/_layout' }, + { file: '(marketing)/route.tsx', id: '/(marketing)' }, + ])('$file is added to the route tree', async ({ file, id }) => { + const routeTree = await generate({ + '__root.tsx': '__root__', + 'index.tsx': '/', + [file]: id, + }) + + expect(routeTree).toContain(`'${id}': typeof`) + }) +}) + +// The route tree lists the index route first, and the router then matches +// `/` to a pathless layout without child routes instead of the index route. +// The generator refuses that pair rather than hide the index route. +test('a pathless layout without child routes yet conflicts with the index route', async () => { + await expect( + generate({ + '__root.tsx': '__root__', + 'index.tsx': '/', + '_auth.tsx': '/_auth', + }), + ).rejects.toThrow( + 'Conflicting configuration paths were found for the following routes: "/", "/".', + ) +}) + +// A pathless layout whose parent directory has no route file of its own +// (`foo/_layout.tsx` without `foo.tsx`) carries that directory's path, so it +// matches `/foo` like any other route there. +describe('a layout without child routes yet that adds a path', () => { + it.each([ + { file: '(group)/foo.tsx', id: '/(group)/foo' }, + { file: 'foo_.tsx', id: '/foo_' }, + ])('conflicts with $file at the same full path', async ({ file, id }) => { + await expect( + generate({ + '__root.tsx': '__root__', + 'foo/_layout.tsx': '/foo/_layout', + [file]: id, + }), + ).rejects.toThrow( + 'Conflicting configuration paths were found for the following routes: "/foo", "/foo".', + ) + }) +}) diff --git a/packages/router-generator/tests/concurrent-write.test.ts b/packages/router-generator/tests/concurrent-write.test.ts new file mode 100644 index 0000000000..6550ad562d --- /dev/null +++ b/packages/router-generator/tests/concurrent-write.test.ts @@ -0,0 +1,148 @@ +import fs from 'node:fs/promises' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +import { Generator, getConfig } from '../src' + +const rootRouteSource = `import { createRootRoute } from '@tanstack/react-router' + +export const Route = createRootRoute() +` + +const postsRouteSource = `import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/posts')({ + component: () => 'posts', +}) +` + +const savedPostsRouteSource = postsRouteSource.replace("'posts'", "'saved'") + +let tempDir: string | undefined + +afterEach(async () => { + if (tempDir) { + await fs.rm(tempDir, { recursive: true, force: true }) + tempDir = undefined + } +}) + +async function readFileWithStat(filePath: string) { + try { + const fileHandle = await fs.open(filePath, 'r') + const stat = await fileHandle.stat({ bigint: true }) + const fileContent = (await fileHandle.readFile()).toString() + await fileHandle.close() + return { stat, fileContent } + } catch (e: any) { + if (e?.code === 'ENOENT') { + return 'file-not-existing' as const + } + throw e + } +} + +describe('generator with concurrent in-place saves', () => { + it.each(['route file read', 'temporary file stat'] as const)( + 'does not scaffold over a route file whose in-place save completes during the %s', + async (completeSaveDuring) => { + tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'tsr-generator-race-')) + const routesDirectory = path.join(tempDir, 'routes') + const tmpDir = path.join(tempDir, 'tmp') + const postsRoutePath = path.join(routesDirectory, 'posts.tsx') + await fs.mkdir(routesDirectory) + await fs.writeFile( + path.join(routesDirectory, '__root.tsx'), + rootRouteSource, + ) + await fs.writeFile(postsRoutePath, postsRouteSource) + + let saveRacesNextRead = false + let completeSave: (() => Promise) | undefined + + const generator = new Generator({ + config: getConfig( + { + disableLogging: true, + routesDirectory, + generatedRouteTree: path.join(tempDir, 'routeTree.gen.ts'), + tmpDir, + }, + tempDir, + ), + root: tempDir, + fs: { + rename: (oldPath, newPath) => fs.rename(oldPath, newPath), + writeFile: (filePath, content) => fs.writeFile(filePath, content), + readFile: async (filePath) => { + // The generator passes route paths with forward slashes, also on + // Windows. + if ( + !saveRacesNextRead || + path.resolve(filePath) !== postsRoutePath + ) { + return readFileWithStat(filePath) + } + saveRacesNextRead = false + + // An editor saving in place truncates the file before writing the + // new content, so the generator can observe an empty route file. + await fs.truncate(postsRoutePath) + const result = await readFileWithStat(postsRoutePath) + if (result === 'file-not-existing') { + throw new Error('expected the route file to exist') + } + + // The save then completes within the same timestamp tick, which is + // common for filesystems with coarse mtime granularity. + completeSave = async () => { + completeSave = undefined + await fs.writeFile(postsRoutePath, savedPostsRouteSource) + const truncatedAt = new Date(Number(result.stat.mtimeMs)) + await fs.utimes(postsRoutePath, truncatedAt, truncatedAt) + } + if (completeSaveDuring === 'route file read') { + await completeSave() + } + + return result + }, + stat: async (filePath) => { + if (completeSave && path.resolve(filePath).startsWith(tmpDir)) { + await completeSave() + } + const stat = await fs.stat(filePath, { bigint: true }) + return { + mtimeMs: stat.mtimeMs, + mode: Number(stat.mode), + uid: Number(stat.uid), + gid: Number(stat.gid), + } + }, + chmod: (filePath, mode) => fs.chmod(filePath, mode), + chown: (filePath, uid, gid) => fs.chown(filePath, uid, gid), + }, + }) + + await generator.run() + + // A first save makes the generator process the route file again, and the + // next save races with that read. + await fs.writeFile( + postsRoutePath, + postsRouteSource.replace("'posts'", "'edited'"), + ) + const editedAt = new Date(Date.now() + 10_000) + await fs.utimes(postsRoutePath, editedAt, editedAt) + saveRacesNextRead = true + await generator.run({ type: 'update', path: postsRoutePath }) + + expect(saveRacesNextRead).toBe(false) + expect(completeSave).toBeUndefined() + await expect(fs.readFile(postsRoutePath, 'utf8')).resolves.toBe( + savedPostsRouteSource, + ) + }, + ) +}) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts index 8f2741b206..bda946f97b 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts @@ -51,16 +51,16 @@ const groupCLayoutCIndexRoute = groupCLayoutCIndexRouteImport.update({ } as any) export interface FileRoutesByFullPath { + '/': typeof groupCLayoutCIndexRoute '/login': typeof groupALayoutALoginRoute '/signup': typeof groupALayoutASignupRoute '/dashboard': typeof groupBLayoutBDashboardRoute - '/': typeof groupCLayoutCIndexRoute } export interface FileRoutesByTo { + '/': typeof groupCLayoutCIndexRoute '/login': typeof groupALayoutALoginRoute '/signup': typeof groupALayoutASignupRoute '/dashboard': typeof groupBLayoutBDashboardRoute - '/': typeof groupCLayoutCIndexRoute } export interface FileRoutesById { __root__: typeof rootRouteImport @@ -74,9 +74,9 @@ export interface FileRoutesById { } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/login' | '/signup' | '/dashboard' | '/' + fullPaths: '/' | '/login' | '/signup' | '/dashboard' fileRoutesByTo: FileRoutesByTo - to: '/login' | '/signup' | '/dashboard' | '/' + to: '/' | '/login' | '/signup' | '/dashboard' id: | '__root__' | '/(group-a)/_layout-a' @@ -99,21 +99,21 @@ declare module '@tanstack/react-router' { '/(group-a)/_layout-a': { id: '/(group-a)/_layout-a' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupALayoutARouteImport parentRoute: typeof rootRouteImport } '/(group-b)/_layout-b': { id: '/(group-b)/_layout-b' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupBLayoutBRouteImport parentRoute: typeof rootRouteImport } '/(group-c)/_layout-c': { id: '/(group-c)/_layout-c' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupCLayoutCRouteImport parentRoute: typeof rootRouteImport } diff --git a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts index e76c675d2c..d3ffbba9e2 100644 --- a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts @@ -76,6 +76,7 @@ const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyRouteImport ) export interface FileRoutesByFullPath { + '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -85,6 +86,7 @@ export interface FileRoutesByFullPath { '/asdf/xyz': typeof fooAsdfbarLayoutXyzLazyRoute } export interface FileRoutesByTo { + '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -108,6 +110,7 @@ export interface FileRoutesById { export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: + | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -117,6 +120,7 @@ export interface FileRouteTypes { | '/asdf/xyz' fileRoutesByTo: FileRoutesByTo to: + | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -151,7 +155,7 @@ declare module '@tanstack/react-router' { '/(bar)/_bar': { id: '/(bar)/_bar' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof barBarRouteImport parentRoute: typeof rootRouteImport } diff --git a/packages/router-generator/tests/transform.test.ts b/packages/router-generator/tests/transform.test.ts index f026ecc30e..2267599c15 100644 --- a/packages/router-generator/tests/transform.test.ts +++ b/packages/router-generator/tests/transform.test.ts @@ -13,7 +13,35 @@ function makeNode( } } +function transformToNewRoute(source: string, node = makeNode()) { + return transform({ + source, + ctx: { target: 'react', routeId: '/new', lazy: false }, + node, + }) +} + describe('transform', () => { + it('reads and rewrites the route constructor, id and options through parentheses', () => { + const node = makeNode() + const result = transformToNewRoute( + [ + "import { createLazyFileRoute } from '@tanstack/react-router'", + "export const Route = (createLazyFileRoute)(('/old'))(({ component: Page, server: {} }))", + ].join('\n'), + node, + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = (createFileRoute)(('/new'))(({ component: Page, server: {} }))", + ].join('\n'), + }) + expect(node.createFileRouteProps).toEqual(new Set(['component', 'server'])) + }) + it('updates parenthesized route calls without changing their surrounding source', () => { const result = transform({ source: @@ -535,4 +563,95 @@ describe('transform', () => { ) expect(result.output).not.toContain('createLazyFileRoute') }) + + // The recorded option keys drive prerendering and server-only route pruning. + it('records identifier and string-literal option keys, not computed or spread ones', () => { + const node = makeNode() + const result = transformToNewRoute( + [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/new')({ 'component': Page, [key]: load, ...rest, server: {} })", + ].join('\n'), + node, + ) + + expect(result).toEqual({ result: 'not-modified' }) + expect(node.createFileRouteProps).toEqual(new Set(['component', 'server'])) + }) +}) + +// The generator writes its output back over the user's route file, so every +// byte outside the route id and the router import must survive unchanged. +describe('transform preserves the rest of the route file', () => { + it('edits the right spans after a BOM and astral characters', () => { + const result = transformToNewRoute( + [ + '\uFEFF// 😀', + "import { createLazyFileRoute } from '@tanstack/react-router'", + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute(/* 🚀 */ '/old')({})", + ].join('\n'), + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + '\uFEFF// 😀', + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute(/* 🚀 */ '/new')({})", + ].join('\n'), + }) + }) + + it.each([ + { + name: 'a default import', + imports: "import Router from '@tanstack/react-router'", + expected: + "import Router, { createFileRoute } from '@tanstack/react-router'", + }, + { + name: 'an aliased import of the constructor', + imports: + "import { createFileRoute as cfr } from '@tanstack/react-router'", + expected: + "import { createFileRoute as cfr, createFileRoute } from '@tanstack/react-router'", + }, + { + // The constructor goes into the named import, never the namespace one. + name: 'a namespace import', + imports: [ + "import * as Router from '@tanstack/react-router'", + "import { Link } from '@tanstack/react-router'", + ].join('\n'), + expected: [ + "import * as Router from '@tanstack/react-router'", + "import { Link, createFileRoute } from '@tanstack/react-router'", + ].join('\n'), + }, + ])('adds the missing constructor next to $name', ({ imports, expected }) => { + const route = "export const Route = createFileRoute('/old')({})" + + expect(transformToNewRoute(`${imports}\n${route}`)).toEqual({ + result: 'modified', + output: `${expected}\n${route.replace('/old', '/new')}`, + }) + }) + + it('updates only the Route declarator of a multi-declarator export', () => { + const result = transformToNewRoute( + [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/old')({}), path = '/old'", + ].join('\n'), + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/new')({}), path = '/old'", + ].join('\n'), + }) + }) }) diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 57357f9746..5b18ae7e6a 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,99 @@ # @tanstack/router-plugin +## 1.169.0 + +### Minor Changes + +- [#8855](https://github.com/TanStack/router/pull/8855) [`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6) - Require Node `^20.19.0 || >=22.12.0` (was `>=20.19`), so the CommonJS builds can load ESM-only dependencies through `require(esm)`. Node 21 and Node 22.0–22.11 do not enable it by default, so they are no longer supported. + +- [#8851](https://github.com/TanStack/router/pull/8851) [`d250819`](https://github.com/TanStack/router/commit/d25081952dd04a5f5a44db7c8df5cbbf50fad054) - Require Vite 6 or later: the `vite` peer range is now `>=6.0.0`. Vite 5 is no longer supported. + +### Patch Changes + +- [`1ba19a0`](https://github.com/TanStack/router/commit/1ba19a04456983ee0f8adffd038b6b1194441e15) - fix: webpack and Rspack production builds no longer put the code splitter's "will not be code-split" warning, with the route file's absolute path, into the client bundle when the build process's `NODE_ENV` isn't `production`. The bundler's mode decides, and a config without `mode` counts as production, as it does for webpack and Rspack. The warning still prints in the build output. + +- [#8852](https://github.com/TanStack/router/pull/8852) [`94f36c4`](https://github.com/TanStack/router/commit/94f36c4a9ecf3062b326a8eb772e73b00c0644d9) - The esbuild plugin now throws when `autoCodeSplitting` is enabled, and `TanStackRouterCodeSplitterEsbuild` throws, instead of silently bundling every route without splitting. Route generation with esbuild is unchanged. + +- [#8856](https://github.com/TanStack/router/pull/8856) [`533ca27`](https://github.com/TanStack/router/commit/533ca2704452f36c5fef5c5fe084554d9b5db1ab) - Remove the undocumented `plugin.hmr.style` option and the `HmrOptions` type. Each bundler entry now picks its own HMR runtime: the webpack and Rspack entries already forced `'webpack'`, and on Vite, `'webpack'` broke route HMR. + +- [#8853](https://github.com/TanStack/router/pull/8853) [`13b6256`](https://github.com/TanStack/router/commit/13b625683030ea4ab359495ecda570e05e472587) - Remove internal code-splitter APIs: the `codeSplittingOptions.compilerPlugins` option, and the root-entry exports `unpluginRouterCodeSplitterFactory`, `getObjectPropertyKeyName`, `CodeSplitCompilerPlugin`, `ReferenceRouteCompilerPlugin`, `ReferenceRouteCompilerPluginContext` and `VirtualRouteSplitNodeCompilerPluginContext`. + +- [#8860](https://github.com/TanStack/router/pull/8860) [`b5e2ac9`](https://github.com/TanStack/router/commit/b5e2ac9c4cee4c5c6f464adc6cfddcddf6c84171) - Source maps of split routes now point at the route file. On webpack and Rspack (including Rsbuild), a split component or shared code mapped to the wrong line, because unplugin's loader dropped the router plugin's map; `unplugin` now requires `^3.5.0`, which keeps it. The maps of split and shared modules also name the route file itself instead of its `?tsr-split` / `?tsr-shared` module id, so debuggers bind breakpoints set in the route file. + +- [#8870](https://github.com/TanStack/router/pull/8870) [`f420d4a`](https://github.com/TanStack/router/commit/f420d4a6dacfaa81d306b7bbc9af8f1010d1a1bc) - Vite route HMR now writes `import.meta.hot.accept(` out instead of calling it through a `hot` alias. Vite only treats a module as a hot boundary when the call is spelled out, so an edit of a route file no framework plugin accepts (a `.ts` route file, or an app without `@vitejs/plugin-react`) reloaded the page instead of updating the route in place. With React HMR, a route file that declares its own top-level `hot` binding no longer fails to compile with `Duplicate declaration "hot"`. + +- Updated dependencies [[`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ad5b3b7`](https://github.com/TanStack/router/commit/ad5b3b7a0990eed7351d672ea6695d341108e0d6), [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69)]: + - @tanstack/router-generator@1.168.0 + - @tanstack/router-utils@1.163.0 + +## 1.168.48 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- [#8737](https://github.com/TanStack/router/pull/8737) [`647cb73`](https://github.com/TanStack/router/commit/647cb737a5622813d276d6042766692ca5ae67ed) - Remove the `enableRouteGeneration` option. Route generation now always runs, so `autoCodeSplitting` always has the route metadata it needs. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`689a7c5`](https://github.com/TanStack/router/commit/689a7c5419de68bce0aaaef72b9a36f115ea1398)]: + - @tanstack/react-router@1.170.46 + - @tanstack/router-core@1.171.39 + - @tanstack/router-generator@1.167.46 + +## 1.168.47 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/react-router@1.170.45 + - @tanstack/router-generator@1.167.45 + +## 1.168.46 + +### Patch Changes + +- Updated dependencies [[`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e)]: + - @tanstack/router-utils@1.162.4 + - @tanstack/router-generator@1.167.44 + +## 1.168.45 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + - @tanstack/react-router@1.170.44 + - @tanstack/router-generator@1.167.43 + +## 1.168.44 + +### Patch Changes + +- [#8655](https://github.com/TanStack/router/pull/8655) [`e66da18`](https://github.com/TanStack/router/commit/e66da18266859ab49e20a7b8c858232449ee5290) - Remove redundant string excludes from the reference code-splitter transform filter to avoid unnecessary glob compilation in unplugin bundler adapters. + +- Updated dependencies [[`57bd1a9`](https://github.com/TanStack/router/commit/57bd1a92f9839af5bf773c3b36d039569fb1a41e), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-generator@1.167.42 + - @tanstack/router-core@1.171.36 + - @tanstack/react-router@1.170.43 + +## 1.168.43 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/router-generator@1.167.41 + +## 1.168.42 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/router-generator@1.167.40 + ## 1.168.41 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index affae0bab4..b681bb61a2 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.41", + "version": "1.169.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -114,7 +114,7 @@ "!skills/_artifacts" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@babel/core": "catalog:", @@ -124,7 +124,7 @@ "@tanstack/router-generator": "workspace:*", "@tanstack/router-utils": "workspace:*", "chokidar": "catalog:", - "unplugin": "^3.3.0", + "unplugin": "^3.5.0", "zod": "catalog:" }, "devDependencies": { @@ -139,6 +139,7 @@ "react-dom": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", + "prettier": "^3.9.6", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:", @@ -147,7 +148,7 @@ "peerDependencies": { "@rsbuild/core": ">=1.0.2 || ^2.0.0", "@tanstack/react-router": "workspace:^", - "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", + "vite": ">=6.0.0", "vite-plugin-solid": "^2.11.10 || ^3.0.0-0", "webpack": ">=5.92.0" }, diff --git a/packages/router-plugin/skills/router-plugin/SKILL.md b/packages/router-plugin/skills/router-plugin/SKILL.md index 972584dc96..5353b7e8c0 100644 --- a/packages/router-plugin/skills/router-plugin/SKILL.md +++ b/packages/router-plugin/skills/router-plugin/SKILL.md @@ -91,23 +91,23 @@ esbuild.build({ plugins: [ tanstackRouter({ target: 'react', - autoCodeSplitting: true, }), ], }) ``` +> Automatic code splitting is not available with esbuild: the plugin throws when `autoCodeSplitting` is `true`. Use manual code splitting (`.lazy.tsx` files) or another bundler to split routes. + ## Configuration Options ### Core Options -| Option | Type | Default | Description | -| ----------------------- | ----------------------------- | -------------------------- | ------------------------------------------ | -| `target` | `'react' \| 'solid' \| 'vue'` | `'react'` | Target framework | -| `routesDirectory` | `string` | `'./src/routes'` | Directory containing route files | -| `generatedRouteTree` | `string` | `'./src/routeTree.gen.ts'` | Path for generated route tree | -| `autoCodeSplitting` | `boolean` | `undefined` | Enable automatic code splitting | -| `enableRouteGeneration` | `boolean` | `true` | Set to `false` to disable route generation | +| Option | Type | Default | Description | +| -------------------- | ----------------------------- | -------------------------- | -------------------------------- | +| `target` | `'react' \| 'solid' \| 'vue'` | `'react'` | Target framework | +| `routesDirectory` | `string` | `'./src/routes'` | Directory containing route files | +| `generatedRouteTree` | `string` | `'./src/routeTree.gen.ts'` | Path for generated route tree | +| `autoCodeSplitting` | `boolean` | `undefined` | Enable automatic code splitting | ### File Convention Options @@ -246,5 +246,5 @@ Changes to `routeTree.gen.ts` are overwritten and can leave source routes, gener ## Cross-References -- [router-core/code-splitting](../../../router-core/skills/router-core/code-splitting/SKILL.md) — manual code splitting concepts -- [virtual-file-routes](../../../virtual-file-routes/skills/virtual-file-routes/SKILL.md) — programmatic route trees +- `@tanstack/router-core#router-core/code-splitting` — manual code splitting concepts +- `@tanstack/virtual-file-routes#virtual-file-routes` — programmatic route trees diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 89cdae41ad..0cd783a58a 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -364,6 +364,7 @@ function removeSharedDeclarations(ast: t.File, sharedBindings: Set) { export function compileCodeSplitReferenceRoute( opts: ParseAstOptions & CompileCodeSplitReferenceRouteOptions & { + isProduction?: boolean compilerPlugins?: Array }, ): GeneratorResult | null { @@ -847,8 +848,9 @@ export function compileCodeSplitReferenceRoute( ) console.warn(warningMessage) - // append this warning to the file using a template - if (process.env.NODE_ENV !== 'production') { + // Development builds log it in the page too. The bundler's mode decides, + // not the build process's NODE_ENV, which webpack never sets. + if (!opts.isProduction) { const warningTemplate = template.statement( `console.warn(${JSON.stringify(warningMessage)})`, )() @@ -1285,7 +1287,8 @@ export function compileCodeSplitVirtualRoute( const result = generateFromAst(ast, { sourceMaps: true, - sourceFileName: opts.filename, + // Name the route file, not this module's `?tsr-*` id. + sourceFileName: removeSplitSearchParamFromFilename(opts.filename), filename: opts.filename, }) @@ -1376,7 +1379,8 @@ export function compileCodeSplitSharedRoute( const result = generateFromAst(ast, { sourceMaps: true, - sourceFileName: opts.filename, + // Name the route file, not this module's `?tsr-*` id. + sourceFileName: removeSplitSearchParamFromFilename(opts.filename), filename: opts.filename, }) diff --git a/packages/router-plugin/src/core/code-splitter/plugins.ts b/packages/router-plugin/src/core/code-splitter/plugins.ts index 1e8ada32b5..94444c1aec 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins.ts @@ -1,6 +1,7 @@ import type babel from '@babel/core' import type * as t from '@babel/types' -import type { Config, DeletableNodes, HmrStyle } from '../config' +import type { Config, DeletableNodes } from '../config' +import type { HmrStyle } from '../hmr' import type { CodeSplitGroupings } from '../constants' import type { SplitNodeMeta } from './types' diff --git a/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts b/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts index a0351ad210..cf4b150807 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts @@ -2,7 +2,8 @@ import { createReactRefreshIgnoredRouteExportsPlugin } from './react-refresh-ign import { createReactRefreshRouteComponentsPlugin } from './react-refresh-route-components' import { createReactStableHmrSplitRouteComponentsPlugin } from './react-stable-hmr-split-route-components' import type { CodeSplitCompilerPlugin } from '../plugins' -import type { Config, HmrStyle } from '../../config' +import type { Config } from '../../config' +import type { HmrStyle } from '../../hmr' export function getFrameworkHmrCompilerPlugins(opts: { targetFramework: Config['target'] diff --git a/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts b/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts index cc2be62034..f951d863b3 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts @@ -5,9 +5,8 @@ import type { ReferenceRouteCompilerPlugin } from '../plugins' const buildReactRefreshIgnoredRouteExportsStatements = template.statements( ` -const hot = import.meta.hot -if (hot && typeof window !== 'undefined') { - hot.data ??= {} +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { const ignoredExportsById = new Map() const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports diff --git a/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts b/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts index 99448f452a..f67a189f40 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts @@ -1,7 +1,7 @@ import * as template from '@babel/template' import * as t from '@babel/types' import { getUniqueProgramIdentifier } from '../../utils' -import type { HmrStyle } from '../../config' +import type { HmrStyle } from '../../hmr' import type { ReferenceRouteCompilerPlugin } from '../plugins' function capitalizeIdentifier(str: string) { diff --git a/packages/router-plugin/src/core/config.ts b/packages/router-plugin/src/core/config.ts index 17c0dd08da..6c11241a01 100644 --- a/packages/router-plugin/src/core/config.ts +++ b/packages/router-plugin/src/core/config.ts @@ -9,7 +9,6 @@ import type { RouteIds, } from '@tanstack/router-core' import type { CodeSplitGroupings } from './constants' -import type { CodeSplitCompilerPlugin } from './code-splitter/plugins' export const splitGroupingsSchema = z .array( @@ -71,25 +70,6 @@ export type CodeSplittingOptions = { * @default true */ addHmr?: boolean - - /** - * Internal compiler plugins used by framework integrations. - * @internal - */ - compilerPlugins?: Array -} - -export type HmrStyle = 'vite' | 'webpack' - -export type HmrOptions = { - /** - * Selects the HMR runtime style to emit code for. - * - `'vite'` (default): ESM `import.meta.hot` with Vite accept-callback semantics. - * - `'webpack'`: `import.meta.webpackHot` with webpack / Rspack `module.hot` re-execution semantics. - * - * Bundler-specific plugin entries (e.g. `rspack.ts`, `webpack.ts`) set this explicitly. - */ - style?: HmrStyle } const codeSplittingOptionsSchema = z.object({ @@ -109,7 +89,6 @@ type FileRouteKeys = keyof (Parameters< export type DeletableNodes = FileRouteKeys | (string & {}) export const configSchema = generatorConfigSchema.extend({ - enableRouteGeneration: z.boolean().optional(), codeSplittingOptions: z .custom((v) => { return codeSplittingOptionsSchema.parse(v) @@ -117,11 +96,6 @@ export const configSchema = generatorConfigSchema.extend({ .optional(), plugin: z .object({ - hmr: z - .object({ - style: z.enum(['vite', 'webpack']).optional(), - }) - .optional(), vite: z .object({ environmentName: z.string().optional(), diff --git a/packages/router-plugin/src/core/hmr/index.ts b/packages/router-plugin/src/core/hmr/index.ts index 4e60f015a1..b3c8545851 100644 --- a/packages/router-plugin/src/core/hmr/index.ts +++ b/packages/router-plugin/src/core/hmr/index.ts @@ -1,5 +1,5 @@ export { createRouteHmrStatement } from './select-adapter' -export type { CreateRouteHmrStatementOpts } from './select-adapter' +export type { CreateRouteHmrStatementOpts, HmrStyle } from './select-adapter' export { createViteHmrStatement } from './vite-adapter' export { createWebpackHmrStatement } from './webpack-adapter' export { getHandleRouteUpdateCode } from './handle-route-update' diff --git a/packages/router-plugin/src/core/hmr/select-adapter.ts b/packages/router-plugin/src/core/hmr/select-adapter.ts index 60395a1534..5ad2646970 100644 --- a/packages/router-plugin/src/core/hmr/select-adapter.ts +++ b/packages/router-plugin/src/core/hmr/select-adapter.ts @@ -1,8 +1,16 @@ import { createViteHmrStatement } from './vite-adapter' import { createWebpackHmrStatement } from './webpack-adapter' -import type { Config, HmrStyle } from '../config' +import type { Config } from '../config' import type * as t from '@babel/types' +/** + * The HMR runtime to emit code for: + * - `'vite'`: ESM `import.meta.hot` with Vite accept-callback semantics. + * - `'webpack'`: `import.meta.webpackHot` with webpack / Rspack `module.hot` + * re-execution semantics. + */ +export type HmrStyle = 'vite' | 'webpack' + export type CreateRouteHmrStatementOpts = { hmrStyle: HmrStyle targetFramework: Config['target'] @@ -10,9 +18,9 @@ export type CreateRouteHmrStatementOpts = { } /** - * Dispatches to the configured HMR adapter. `hmrStyle` is set explicitly by - * the bundler-specific plugin entry (e.g. `rspack.ts` → `'webpack'`), so there - * is no runtime inference based on config string shapes. + * Dispatches to the HMR adapter of the bundler the plugin runs in. `hmrStyle` + * comes from the bundler-specific plugin entry (e.g. `rspack.ts` → + * `'webpack'`), not from user config. */ export function createRouteHmrStatement( stableRouteOptionKeys: Array, diff --git a/packages/router-plugin/src/core/hmr/vite-adapter.ts b/packages/router-plugin/src/core/hmr/vite-adapter.ts index ba8d42a80a..5357c45acf 100644 --- a/packages/router-plugin/src/core/hmr/vite-adapter.ts +++ b/packages/router-plugin/src/core/hmr/vite-adapter.ts @@ -4,7 +4,9 @@ import type * as t from '@babel/types' /** * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept` - * with a callback that receives the freshly re-imported module. + * with a callback that receives the freshly re-imported module. Vite makes the + * module a hot boundary only when the code spells `import.meta.hot.accept(` + * out, so the call must not go through an alias. * * `targetFramework` is currently unused — Vite's framework-specific fast-refresh * plugins handle component body patching via their own accept boundaries — but @@ -26,8 +28,7 @@ export function createViteHmrStatement( template.statement( ` if (import.meta.hot) { - const hot = import.meta.hot - const hotData = hot.data ??= {} + const hotData = import.meta.hot.data ??= {} const handleRouteUpdate = ${handleRouteUpdateCode} const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id'] if (initialRouteId) { @@ -41,7 +42,7 @@ if (import.meta.hot) { handleRouteUpdate(initialRouteId, Route) hotData['tsr-route-update-handled'] = Route } - hot.accept((newModule) => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback} if (routeId) { diff --git a/packages/router-plugin/src/core/router-code-splitter-plugin.ts b/packages/router-plugin/src/core/router-code-splitter-plugin.ts index f1f75d4f3c..ecc7607d59 100644 --- a/packages/router-plugin/src/core/router-code-splitter-plugin.ts +++ b/packages/router-plugin/src/core/router-code-splitter-plugin.ts @@ -17,7 +17,6 @@ import { getFrameworkHmrCompilerPlugins } from './code-splitter/plugins/framewor import { defaultCodeSplitGroupings, splitRouteIdentNodes, - tsrShared, tsrSplit, } from './constants' import { debug, normalizePath, routeFactoryCallCodeFilter } from './utils' @@ -25,7 +24,8 @@ import { createRouterPluginContext } from './router-plugin-context' import type { CodeSplitGroupings, SplitRouteIdentNodes } from './constants' import type { GetRoutesByFileMapResultValue } from '@tanstack/router-generator' import type { CodeSplitCompilerPlugin } from './code-splitter/plugins' -import type { Config, HmrStyle } from './config' +import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RouterPluginContext } from './router-plugin-context' import type { UnpluginFactory, @@ -81,11 +81,11 @@ const TRANSFORMATION_PLUGINS_BY_FRAMEWORK: Record< export function createRouterCodeSplitterPlugin( options: Partial Config)> | undefined = {}, routerPluginContext: RouterPluginContext, + hmrStyle: HmrStyle = 'vite', ): ReturnType Config)> | undefined>> { let ROOT: string = process.cwd() let userConfig: Config let addHmr: boolean - let hmrStyle: HmrStyle let compilerPlugins: Array let virtualRouteCompilerPlugins: Array @@ -99,16 +99,12 @@ export function createRouterCodeSplitterPlugin( } addHmr = (userConfig.codeSplittingOptions?.addHmr ?? true) && !isProduction - hmrStyle = userConfig.plugin?.hmr?.style ?? 'vite' - compilerPlugins = [ - ...(addHmr - ? (getFrameworkHmrCompilerPlugins({ - targetFramework: userConfig.target, - hmrStyle, - }) ?? []) - : []), - ...(userConfig.codeSplittingOptions?.compilerPlugins ?? []), - ] + compilerPlugins = addHmr + ? (getFrameworkHmrCompilerPlugins({ + targetFramework: userConfig.target, + hmrStyle, + }) ?? []) + : [] virtualRouteCompilerPlugins = compilerPlugins.filter( (plugin) => plugin.onVirtualRouteSplitNode, ) @@ -186,6 +182,7 @@ export function createRouterCodeSplitterPlugin( targetFramework: userConfig.target, filename: id, id, + isProduction, deleteNodes: userConfig.codeSplittingOptions?.deleteNodes ? new Set(userConfig.codeSplittingOptions.deleteNodes) : undefined, @@ -261,7 +258,6 @@ export function createRouterCodeSplitterPlugin( transform: { filter: { id: { - exclude: [tsrSplit, tsrShared], // this is necessary for webpack / rspack to avoid matching .html files include: /\.(m|c)?(j|t)sx?$/, }, @@ -332,13 +328,13 @@ export function createRouterCodeSplitterPlugin( }, rspack(compiler) { - isProduction = compiler.options.mode === 'production' + isProduction = (compiler.options.mode ?? 'production') === 'production' ROOT = process.cwd() initUserConfig() }, webpack(compiler) { - isProduction = compiler.options.mode === 'production' + isProduction = (compiler.options.mode ?? 'production') === 'production' ROOT = process.cwd() initUserConfig() }, diff --git a/packages/router-plugin/src/core/router-composed-plugin.ts b/packages/router-plugin/src/core/router-composed-plugin.ts index c778e4e8d4..5bcaaf8da9 100644 --- a/packages/router-plugin/src/core/router-composed-plugin.ts +++ b/packages/router-plugin/src/core/router-composed-plugin.ts @@ -4,6 +4,7 @@ import { createRouterCodeSplitterPlugin } from './router-code-splitter-plugin' import { createRouterHmrPlugin } from './router-hmr-plugin' import { createRouterPluginContext } from './router-plugin-context' import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RspackCompiler, UnpluginFactory, @@ -30,13 +31,18 @@ function applyRspackInlineCssDefaultDefinePlugin(compiler: RspackCompiler) { export const unpluginRouterComposedFactory: UnpluginFactory< Partial Config)> | undefined -> = (options = {}, _meta) => { +> = (options = {}, meta) => { const ROOT: string = process.cwd() const userConfig = getConfig( (typeof options === 'function' ? options() : options) as Partial, ROOT, ) const routerPluginContext = createRouterPluginContext() + // webpack and Rspack share webpack's `import.meta.webpackHot` HMR API. + const hmrStyle: HmrStyle = + meta.framework === 'webpack' || meta.framework === 'rspack' + ? 'webpack' + : 'vite' const getPlugin = (plugin: ReturnType>) => { if (!Array.isArray(plugin)) { @@ -49,7 +55,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< createRouterGeneratorPlugin(options, routerPluginContext), ) const routerCodeSplitter = getPlugin( - createRouterCodeSplitterPlugin(options, routerPluginContext), + createRouterCodeSplitterPlugin(options, routerPluginContext, hmrStyle), ) const result = [ @@ -89,7 +95,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< if (!isProduction && !userConfig.autoCodeSplitting) { const routerHmr = getPlugin( - createRouterHmrPlugin(options, routerPluginContext), + createRouterHmrPlugin(options, routerPluginContext, hmrStyle), ) result.push(...routerHmr) } diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 46dda8c581..50dde9f55c 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -19,8 +19,6 @@ export function createRouterGeneratorPlugin( let userConfig: Config let generator: Generator - const routeGenerationDisabled = () => - userConfig.enableRouteGeneration === false const getRoutesDirectoryPath = () => { return isAbsolute(userConfig.routesDirectory) ? userConfig.routesDirectory @@ -46,9 +44,6 @@ export function createRouterGeneratorPlugin( file: string event: 'create' | 'update' | 'delete' }) => { - if (routeGenerationDisabled()) { - return - } let generatorEvent: GeneratorEvent | undefined = undefined if (opts) { const filePath = normalize(opts.file) diff --git a/packages/router-plugin/src/core/router-hmr-plugin.ts b/packages/router-plugin/src/core/router-hmr-plugin.ts index e1dc01a43b..3f14a38be5 100644 --- a/packages/router-plugin/src/core/router-hmr-plugin.ts +++ b/packages/router-plugin/src/core/router-hmr-plugin.ts @@ -7,6 +7,7 @@ import { getConfig } from './config' import { createRouterPluginContext } from './router-plugin-context' import type { UnpluginFactory } from 'unplugin' import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RouterPluginContext } from './router-plugin-context' /** @@ -18,6 +19,7 @@ import type { RouterPluginContext } from './router-plugin-context' export function createRouterHmrPlugin( options: Partial Config)> | undefined = {}, routerPluginContext: RouterPluginContext, + hmrStyle: HmrStyle = 'vite', ): ReturnType | undefined>> { let ROOT: string = process.cwd() @@ -47,8 +49,6 @@ export function createRouterHmrPlugin( if (debug) console.info('Adding HMR handling to route ', normalizedId) - const hmrStyle = userConfig.plugin?.hmr?.style ?? 'vite' - if (userConfig.target === 'react') { const compilerPlugins = getFrameworkHmrCompilerPlugins({ targetFramework: 'react', diff --git a/packages/router-plugin/src/esbuild.ts b/packages/router-plugin/src/esbuild.ts index 650082964d..e2c184bb3d 100644 --- a/packages/router-plugin/src/esbuild.ts +++ b/packages/router-plugin/src/esbuild.ts @@ -1,7 +1,6 @@ import { createEsbuildPlugin } from 'unplugin' -import { configSchema } from './core/config' -import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin' +import { configSchema, getConfig } from './core/config' import { createRouterGeneratorPlugin } from './core/router-generator-plugin' import { unpluginRouterComposedFactory } from './core/router-composed-plugin' import { createRouterPluginContext } from './core/router-plugin-context' @@ -13,6 +12,20 @@ type RouterPluginOptions = Partial Config)> | undefined const defaultRouterPluginContext = createRouterPluginContext() +const ESBUILD_SPLITTING_ERROR = + '@tanstack/router-plugin: route code splitting (`autoCodeSplitting`) is not supported with esbuild. ' + + 'Use the generator alone (`TanStackRouterGeneratorEsbuild`), or set `autoCodeSplitting: false`.' + +function refuseSplitting(options: RouterPluginOptions) { + const config = + typeof options === 'function' + ? options() + : getConfig(options ?? {}, process.cwd()) + if (config.autoCodeSplitting) { + throw new Error(ESBUILD_SPLITTING_ERROR) + } +} + /** * @example * ```ts @@ -33,22 +46,14 @@ const TanStackRouterGeneratorEsbuild = ( } /** - * @example - * ```ts - * export default { - * plugins: [TanStackRouterCodeSplitterEsbuild()], - * // ... - * } - * ``` + * Route code splitting is not available with esbuild: this entry refuses + * clearly. */ const TanStackRouterCodeSplitterEsbuild = ( - options?: RouterPluginOptions, - routerPluginContext?: RouterPluginContext, -) => { - const pluginContext = routerPluginContext ?? defaultRouterPluginContext - return createEsbuildPlugin((pluginOptions: RouterPluginOptions) => - createRouterCodeSplitterPlugin(pluginOptions, pluginContext), - )(options) + _options?: RouterPluginOptions, + _routerPluginContext?: RouterPluginContext, +): never => { + throw new Error(ESBUILD_SPLITTING_ERROR) } /** @@ -60,7 +65,10 @@ const TanStackRouterCodeSplitterEsbuild = ( * } * ``` */ -const TanStackRouterEsbuild = createEsbuildPlugin(unpluginRouterComposedFactory) +const TanStackRouterEsbuild = (options: RouterPluginOptions = {}) => { + refuseSplitting(options) + return createEsbuildPlugin(unpluginRouterComposedFactory)(options) +} const tanstackRouter = TanStackRouterEsbuild export default TanStackRouterEsbuild diff --git a/packages/router-plugin/src/index.ts b/packages/router-plugin/src/index.ts index 6a6ad158bb..c892c32671 100644 --- a/packages/router-plugin/src/index.ts +++ b/packages/router-plugin/src/index.ts @@ -1,5 +1,4 @@ export { configSchema, getConfig } from './core/config' -export { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin' export { unpluginRouterGeneratorFactory } from './core/router-generator-plugin' export { createRouterPluginContext } from './core/router-plugin-context' export type { @@ -8,16 +7,8 @@ export type { ConfigOutput, CodeSplittingOptions, DeletableNodes, - HmrOptions, } from './core/config' export type { RouterPluginContext } from './core/router-plugin-context' -export { getObjectPropertyKeyName } from './core/utils' -export type { - CodeSplitCompilerPlugin, - ReferenceRouteCompilerPlugin, - ReferenceRouteCompilerPluginContext, - VirtualRouteSplitNodeCompilerPluginContext, -} from './core/code-splitter/plugins' export { tsrSplit, splitRouteIdentNodes, diff --git a/packages/router-plugin/src/rspack.ts b/packages/router-plugin/src/rspack.ts index a31bde74af..6020179cce 100644 --- a/packages/router-plugin/src/rspack.ts +++ b/packages/router-plugin/src/rspack.ts @@ -12,35 +12,6 @@ type RspackRouterPluginOptions = Partial | (() => Partial) const defaultRouterPluginContext = createRouterPluginContext() -/** - * Rspack uses webpack-compatible `module.hot` / `import.meta.webpackHot` HMR. - * Force `plugin.hmr.style = 'webpack'` so the router HMR adapter emits - * `module.hot`-style accept/dispose code instead of Vite's callback-receive - * variant, regardless of what the user passes (or doesn't pass). - */ -function withWebpackHmrStyle( - options: RspackRouterPluginOptions | undefined, -): RspackRouterPluginOptions { - const mergeHmrStyle = ( - config: Partial | undefined, - ): Partial => ({ - ...config, - plugin: { - ...config?.plugin, - hmr: { - ...config?.plugin?.hmr, - style: 'webpack', - }, - }, - }) - - if (typeof options === 'function') { - return () => mergeHmrStyle(options()) - } - - return mergeHmrStyle(options) -} - /** * @example * ```ts @@ -68,6 +39,9 @@ const TanStackRouterGeneratorRspack = ( } /** + * Rspack uses webpack-compatible `import.meta.webpackHot` HMR, which the + * code splitter emits for it. + * * @example * ```ts * export default defineConfig({ @@ -87,10 +61,9 @@ const TanStackRouterCodeSplitterRspack = ( const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createRspackPlugin((pluginOptions) => createRouterCodeSplitterPlugin( - withWebpackHmrStyle( - pluginOptions as RspackRouterPluginOptions | undefined, - ) as Partial Config)>, + pluginOptions as Partial Config)> | undefined, pluginContext, + 'webpack', ), )(options) } @@ -109,13 +82,7 @@ const TanStackRouterCodeSplitterRspack = ( * ``` */ const TanStackRouterRspack = /* #__PURE__ */ createRspackPlugin( - (options, meta) => - unpluginRouterComposedFactory( - withWebpackHmrStyle( - options as RspackRouterPluginOptions | undefined, - ) as Partial Config)>, - meta, - ), + unpluginRouterComposedFactory, ) const tanstackRouter = TanStackRouterRspack export default TanStackRouterRspack diff --git a/packages/router-plugin/src/webpack.ts b/packages/router-plugin/src/webpack.ts index 712372565e..9a0063fd6f 100644 --- a/packages/router-plugin/src/webpack.ts +++ b/packages/router-plugin/src/webpack.ts @@ -10,26 +10,6 @@ import type { RouterPluginContext } from './core/router-plugin-context' const defaultRouterPluginContext = createRouterPluginContext() -/** - * Webpack uses `module.hot` / `import.meta.webpackHot` HMR. Force - * `plugin.hmr.style = 'webpack'` so the router HMR adapter emits the correct - * accept/dispose shape regardless of user config. - */ -function withWebpackHmrStyle( - options: Partial | undefined, -): Partial { - return { - ...options, - plugin: { - ...options?.plugin, - hmr: { - ...options?.plugin?.hmr, - style: 'webpack', - }, - }, - } -} - /** * @example * ```ts @@ -50,6 +30,8 @@ const TanStackRouterGeneratorWebpack = ( } /** + * Route HMR in development goes through `import.meta.webpackHot`. + * * @example * ```ts * export default { @@ -64,10 +46,7 @@ const TanStackRouterCodeSplitterWebpack = ( ) => { const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createWebpackPlugin((pluginOptions: Partial | undefined) => - createRouterCodeSplitterPlugin( - withWebpackHmrStyle(pluginOptions), - pluginContext, - ), + createRouterCodeSplitterPlugin(pluginOptions, pluginContext, 'webpack'), )(options) } @@ -81,11 +60,7 @@ const TanStackRouterCodeSplitterWebpack = ( * ``` */ const TanStackRouterWebpack = /* #__PURE__ */ createWebpackPlugin( - (options, meta) => - unpluginRouterComposedFactory( - withWebpackHmrStyle(options as Partial | undefined), - meta, - ), + unpluginRouterComposedFactory, ) const tanstackRouter = TanStackRouterWebpack diff --git a/packages/router-plugin/tests/add-hmr.test.ts b/packages/router-plugin/tests/add-hmr.test.ts index 98b3e61a5f..0d89832f3b 100644 --- a/packages/router-plugin/tests/add-hmr.test.ts +++ b/packages/router-plugin/tests/add-hmr.test.ts @@ -1,5 +1,13 @@ -import { readFile, readdir } from 'node:fs/promises' +import { + mkdir, + mkdtemp, + readFile, + readdir, + rm, + writeFile, +} from 'node:fs/promises' import path from 'node:path' +import { createServer } from 'vite' import { describe, expect, it } from 'vitest' import { compileCodeSplitReferenceRoute } from '../src/core/code-splitter/compilers' @@ -7,6 +15,7 @@ import { defaultCodeSplitGroupings } from '../src/core/constants' import { getFrameworkHmrCompilerPlugins } from '../src/core/code-splitter/plugins/framework-plugins' import { createRouteHmrStatement } from '../src/core/hmr' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' function getFrameworkDir(framework: string) { const files = path.resolve(__dirname, `./add-hmr/test-files/${framework}`) @@ -37,7 +46,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@true.tsx')), ) }, @@ -58,7 +69,9 @@ describe('add-hmr works', () => { targetFramework: framework, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@false.tsx')), ) }, @@ -87,7 +100,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join( getFrameworkDir(framework).snapshots, filename.replace('.tsx', '@webpack-hot.tsx'), @@ -189,3 +204,174 @@ describe('add-hmr works', () => { expect(output).not.toContain('/__root') }) }) + +/** + * Starts a Vite dev server with the router plugin (and no framework plugin) + * for an app made of `files`, connects an HMR client to it the way the + * browser's `/@vite/client` does, and requests the app's modules from + * `main.ts` on, as a page would. + */ +async function startDevApp( + files: Record, + options: { autoCodeSplitting: boolean }, +) { + // Keep the app inside the package so runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.add-hmr-')) + await mkdir(path.join(root, 'routes')) + const allFiles: Record = { + 'index.html': '', + 'main.ts': `import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +export const router = createRouter({ routeTree }) +`, + 'routes/__root.tsx': `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({}) +`, + ...files, + } + for (const [file, code] of Object.entries(allFiles)) { + await writeFile(path.join(root, file), code) + } + const { tanstackRouter } = await import('../src/vite') + const server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + server: { port: 0, strictPort: false }, + // A dependency optimisation would reload the page on its own. + optimizeDeps: { noDiscovery: true, include: [] }, + plugins: [ + tanstackRouter({ + target: 'react', + routesDirectory: './routes', + generatedRouteTree: './routeTree.gen.ts', + autoCodeSplitting: options.autoCodeSplitting, + }), + ], + }) + const close = async () => { + await server.close() + await rm(root, { recursive: true, force: true }) + } + try { + await server.listen() + const origin = server.resolvedUrls!.local[0]!.replace(/\/$/, '') + const messages: Array<{ type: string }> = [] + const socket = new WebSocket( + `${origin.replace('http', 'ws')}/?token=${server.config.webSocketToken}`, + 'vite-hmr', + ) + socket.addEventListener('message', (event) => { + messages.push(JSON.parse(String(event.data))) + }) + await new Promise((resolve, reject) => { + socket.addEventListener('open', resolve) + socket.addEventListener('error', reject) + }) + const statuses: Record = {} + const served: Record = {} + const queue = ['/main.ts'] + while (queue.length > 0) { + const url = queue.shift()! + if (url in statuses) { + continue + } + const response = await fetch(origin + url) + statuses[url] = response.status + const code = await response.text() + served[url] = code + // Static imports of the app's own modules + for (const [, imported] of code.matchAll( + /^import\s[^'"]*?["'](\/(?!@|node_modules)[^"'?]+)["']/gm, + )) { + queue.push(imported!) + } + } + return { + statuses, + served, + /** Writes `code` to `file`; resolves with Vite's first reaction. */ + async edit(file: string, code: string) { + const seen = messages.length + await writeFile(path.join(root, file), code) + const deadline = Date.now() + 10_000 + while (Date.now() < deadline) { + const reaction = messages + .slice(seen) + .find( + (message) => + message.type === 'update' || message.type === 'full-reload', + ) + if (reaction) { + return reaction.type + } + await new Promise((resolve) => setTimeout(resolve, 50)) + } + return 'nothing' + }, + async close() { + socket.close() + await close() + }, + } + } catch (error) { + await close() + throw error + } +} + +describe('route HMR in a Vite dev server', () => { + // Vite makes a module a hot boundary only when its code spells + // `import.meta.hot.accept(` out. Route modules no framework plugin accepts + // (a `.ts` route file, or an app without `@vitejs/plugin-react`) reloaded + // the page on every edit. + it.each([ + { + name: 'a .ts route file', + file: 'routes/index.ts', + code: `import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ loader: () => 'data v1' }) +`, + autoCodeSplitting: true, + }, + { + name: 'a route component, without a framework plugin', + file: 'routes/index.tsx', + code: `import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: () =>

page v1

}) +`, + autoCodeSplitting: false, + }, + ])( + 'an edit of $name is a hot update, not a page reload', + async ({ file, code, autoCodeSplitting }) => { + const app = await startDevApp({ [file]: code }, { autoCodeSplitting }) + try { + expect(app.statuses[`/${file}`]).toBe(200) + expect(await app.edit(file, code.replace('v1', 'v2'))).toBe('update') + } finally { + await app.close() + } + }, + 30_000, + ) + + it('serves a route file with a binding named hot', async () => { + const app = await startDevApp( + { + 'routes/index.tsx': `import { createFileRoute } from '@tanstack/react-router' +const hot = 'hot' +export const Route = createFileRoute('/')({ component: () =>

{hot}

}) +`, + }, + // Unsplit, so the binding stays in the module the HMR code goes into + { autoCodeSplitting: false }, + ) + try { + expect(app.statuses['/routes/index.tsx']).toBe(200) + expect(app.served['/routes/index.tsx']).toMatch(/const hot = ["']hot["']/) + } finally { + await app.close() + } + }, 30_000) +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx index 48e3768224..994c89e7b2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx index 4f32369e8f..e45f8b634a 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx @@ -1,109 +1,115 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("arrow-function.tsx", ['Route']); + component: TSRSplitComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('arrow-function.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx index 12e47f429e..eb655d0287 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx @@ -1,87 +1,107 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.webpackHot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.webpackHot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.webpackHot) { - (import.meta.webpackHot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.webpackHot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) if (import.meta.webpackHot) { - const hot = import.meta.webpackHot; - const hotData = hot.data ??= {}; - const routeId = hotData['tsr-route-id'] ?? Route.id ?? (Route.isRoot ? '__root__' : undefined); + const hot = import.meta.webpackHot + const hotData = (hot.data ??= {}) + const routeId = + hotData['tsr-route-id'] ?? + Route.id ?? + (Route.isRoot ? '__root__' : undefined) if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } - const existingRoute = typeof window !== 'undefined' && routeId ? window.__TSR_ROUTER__?.routesById?.[routeId] : undefined; + const existingRoute = + typeof window !== 'undefined' && routeId + ? window.__TSR_ROUTER__?.routesById?.[routeId] + : undefined if (routeId && existingRoute && existingRoute !== Route) { - (function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + ;(function handleRouteUpdate(routeId, newRoute) { + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - })(routeId, Route); + })(routeId, Route) try { - const tsrReactRefreshUtils = typeof __react_refresh_utils__ !== 'undefined' ? __react_refresh_utils__ : undefined; - const tsrEnqueueUpdate = tsrReactRefreshUtils && typeof tsrReactRefreshUtils.enqueueUpdate === 'function' ? tsrReactRefreshUtils.enqueueUpdate : undefined; + const tsrReactRefreshUtils = + typeof __react_refresh_utils__ !== 'undefined' + ? __react_refresh_utils__ + : undefined + const tsrEnqueueUpdate = + tsrReactRefreshUtils && + typeof tsrReactRefreshUtils.enqueueUpdate === 'function' + ? tsrReactRefreshUtils.enqueueUpdate + : undefined if (tsrEnqueueUpdate) { - tsrEnqueueUpdate(() => {}); + tsrEnqueueUpdate(() => {}) } } catch (_err) {} } - hot.dispose(data => { + hot.dispose((data) => { if (routeId) { - data['tsr-route-id'] = routeId; + data['tsr-route-id'] = routeId } - }); - hot.accept(); -} \ No newline at end of file + }) + hot.accept() +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx index a2983e31bd..e0b52f6ad6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx @@ -1,12 +1,17 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/lowercase-components')({ pendingComponent: pendingComponent, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) function pendingComponent() { - return
Pending
; -} \ No newline at end of file + return
Pending
+} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx index 70c428363e..441852d762 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx @@ -1,120 +1,134 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/lowercase-components')({ pendingComponent: TSRPendingComponent, errorComponent: TSRSplitErrorComponent, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) function TSRPendingComponent() { - return
Pending
; + return
Pending
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createFileRoute-lowercase-components.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createFileRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx index 5daf018617..7e3ad124ae 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx @@ -1,6 +1,3 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: () =>
root hmr
, -}) +export const Route = createRootRoute({ component: () =>
root hmr
}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx index e5a473dc14..f45186bdd9 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx @@ -1,98 +1,100 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -const TSRComponent = () =>
root hmr
; -export const Route = createRootRoute({ - component: TSRComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-inline-component.tsx", ['Route']); +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +const TSRComponent = () =>
root hmr
+export const Route = createRootRoute({ component: TSRComponent }) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-inline-component.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx index 20c9a07798..6fac4df1f1 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx @@ -1,25 +1,20 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - export const Route = createRootRoute({ shellComponent: shellComponent, pendingComponent: pendingComponent, errorComponent: errorComponent, component: component, }) - function shellComponent({ children }: { children: React.ReactNode }) { return {children} } - function pendingComponent() { return
Pending
} - function errorComponent() { return
Error
} - function component() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx index cb5014cd35..f9a6875fe7 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx @@ -1,116 +1,116 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' export const Route = createRootRoute({ shellComponent: TSRShellComponent, pendingComponent: TSRPendingComponent, errorComponent: TSRErrorComponent, - component: TSRComponent -}); -function TSRShellComponent({ - children -}: { - children: React.ReactNode; -}) { - return {children}; + component: TSRComponent, +}) +function TSRShellComponent({ children }: { children: React.ReactNode }) { + return {children} } function TSRPendingComponent() { - return
Pending
; + return
Pending
} function TSRErrorComponent() { - return
Error
; + return
Error
} function TSRComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-lowercase-components.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx index e967791f8d..5c779d9876 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx @@ -1,10 +1,6 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: RootComponent, -}) - +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx index 7ba271c212..3bde5adf5c 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx @@ -1,100 +1,99 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -export const Route = createRootRoute({ - component: RootComponent -}); +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('createRootRoute.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx index 0feadacab5..43f27087a6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx @@ -1,14 +1,11 @@ import * as React from 'react' import { createRootRouteWithContext } from '@tanstack/react-router' - interface MyRouterContext { auth: boolean } - export const Route = createRootRouteWithContext()({ component: RootComponent, }) - function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx index b66449aebf..c96d6f01a5 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx @@ -1,103 +1,107 @@ -import * as React from 'react'; -import { createRootRouteWithContext } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRouteWithContext } from '@tanstack/react-router' interface MyRouterContext { - auth: boolean; + auth: boolean } export const Route = createRootRouteWithContext()({ - component: RootComponent -}); + component: RootComponent, +}) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRouteWithContext-type-args.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRouteWithContext-type-args.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx index fee0b2f2e6..99674604fa 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx @@ -1,97 +1,98 @@ -import React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/')({ - component: undefined -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("explicit-undefined-component.tsx", ['Route']); +import React from 'react' +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: undefined }) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('explicit-undefined-component.tsx', [ + 'Route', + ]) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx index 5d7e2181f5..e2b672f7b8 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx index 4a925828e2..614c38c954 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx @@ -1,109 +1,115 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("function-declaration.tsx", ['Route']); + component: TSRSplitComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('function-declaration.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx index 653c0c21f5..456134aadc 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx index ca2a7ab2e2..871bf352e0 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx @@ -1,119 +1,130 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: TSRSplitComponent, - errorComponent: TSRSplitErrorComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("multi-component.tsx", ['Route']); + errorComponent: TSRSplitErrorComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('multi-component.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx index 4fc3129e14..cfb23b03d2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': lazyRouteComponent($$splitComponentImporter, 'component'), - 'errorComponent': lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx index b6f67e67b1..6d5b2a1fd3 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx @@ -1,119 +1,130 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': TSRSplitComponent, - 'errorComponent': TSRSplitErrorComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("string-literal-keys.tsx", ['Route']); + component: TSRSplitComponent, + errorComponent: TSRSplitErrorComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('string-literal-keys.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx index b09548da57..10bedc87f0 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx index 754da5c902..bc531f9000 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx @@ -1,80 +1,79 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = []; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/code-splitter-dead-code.test.ts b/packages/router-plugin/tests/code-splitter-dead-code.test.ts new file mode 100644 index 0000000000..038f323caf --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-dead-code.test.ts @@ -0,0 +1,462 @@ +import { describe, expect, it } from 'vitest' +import { + compileRouteModules, + declarationOf, + evaluateModule, + expectValidModules, + head, + importSources, + importedNames, + transformWithRouteHmrPlugin, +} from './regression-helpers' + +const sharedModule = 'route.tsx?tsr-shared=1' + +/** Whether a module declares `name` or imports it from the shared module. */ +function binds(module: string, name: string) { + return ( + declarationOf(name).test(module) || + importedNames(module, sharedModule).includes(name) + ) +} + +/** + * The reference module, compiled without and with React HMR: HMR rewrites the + * route options (hoisted components, refresh anchor) before dead code is + * removed, so the removal runs on a different program. + */ +function referenceModules(code: string) { + return { + reference: compileRouteModules(code).modules.reference!, + 'reference with HMR': compileRouteModules(code, { hmr: true }).modules + .reference!, + } +} + +/** + * Renders the split component the way an app loads it: the shared module (if + * any) and the reference module run first, then the component chunk, all + * linked to one instance of the shared module. A top-level statement may then + * reach the component by moving into its chunk or by staying in the + * reference module and writing to a shared binding. + */ +async function renderSplitComponent(modules: Record) { + const stubs: Record> = {} + if (modules.shared) { + stubs[sharedModule] = await evaluateModule(modules.shared) + } + await evaluateModule(modules.reference!, { + ...stubs, + '@tanstack/react-router': { + createFileRoute: () => (options: unknown) => ({ options }), + lazyRouteComponent: () => () => null, + }, + }) + const chunk = await evaluateModule(modules['virtual component']!, stubs) + return chunk.component!() +} + +describe('the reference module only drops code that splitting left unused', () => { + it.each([ + { + name: 'a store subscription that unsubscribes itself', + setup: `import { store } from './store' +const unsubscribe = store.subscribe(() => { + if (store.state.done) unsubscribe() +})`, + declared: ['unsubscribe'], + }, + { + name: 'mutually-referencing declarations', + setup: `import { createPersister } from './persist' +const persister = createPersister({ onRestore: () => restore() }) +function restore() { + persister.restore() +}`, + declared: ['persister', 'restore'], + }, + { + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "only + // eliminates newly unreferenced identifiers", "unexported circular references" + // and "SCC with external caller used -> all preserved" + name: 'unused functions, one calling a helper of the split component', + setup: `function helper() { return 'helper' } +function unused() { return helper() } +function ping(): number { return pong() } +function pong(): number { return ping() }`, + component: '

{helper()}

', + declared: ['helper', 'unused', 'ping', 'pong'], + }, + ])( + 'keeps $name that nothing used before splitting', + async ({ setup, component = '
', declared }) => { + const code = `${head}${setup} +export const Route = createFileRoute('/')({ component: () => ${component} }) +` + const modules = referenceModules(code) + // The validator does not report references to undeclared names. A + // binding the split component reads may come from the shared module. + for (const [module, reference] of Object.entries(modules)) { + for (const name of declared) { + expect(binds(reference, name), `${module} binds ${name}`).toBe(true) + } + } + await expectValidModules(modules) + }, + ) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "SCC dead + // code elimination" > "arrow functions in mutual recursion -> removed" + it('moves mutually recursive helpers only the component uses, and their imports, into its chunk', async () => { + const code = `${head}import { dep } from './dep' +const ping = (n: number): number => (n > 0 ? pong(n - 1) : 0) +const pong = function (n: number): number { return n > 0 ? ping(n - 1) : dep } +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{ping(3)}

, +}) +` + for (const reference of Object.values(referenceModules(code))) { + expect(reference).not.toMatch(declarationOf('ping')) + expect(reference).not.toMatch(declarationOf('pong')) + expect(importSources(reference)).not.toContain('./dep') + } + const { modules } = compileRouteModules(code) + expect(modules['virtual component']).toMatch(declarationOf('ping')) + expect(modules['virtual component']).toMatch(declarationOf('pong')) + await expectValidModules(modules) + }) + + // Source: Next.js ssg/getStaticProps/should-remove-re-exported-function-declarations-dependents-variables-functions-imports + it('keeps the import specifiers nothing used before splitting', async () => { + const { modules } = + compileRouteModules(`${head}import { used, preUnused } from 'bar' +const b = function apples() { return used } +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{b()}

, +}) +`) + expect(importedNames(modules.reference!, 'bar')).toEqual(['preUnused']) + expect(modules.reference).not.toContain('apples') + expect(modules['virtual component']).toMatch(declarationOf('b')) + expect(importedNames(modules['virtual component']!, 'bar')).toContain( + 'used', + ) + await expectValidModules(modules) + }) + + // Source: React Router route-chunks-test.ts "shared imports across chunks but + // not main chunk with shared side effect usage" + it('runs a top-level call only in the reference module, even when the chunks import its callee', async () => { + const { modules } = + compileRouteModules(`${head}import { shared } from './shared' +shared('side-effect-marker') +export const Route = createFileRoute('/')({ + component: () =>
{shared('component')}
, + errorComponent: () =>
{shared('error')}
, +}) +`) + expect(modules.reference).toContain('side-effect-marker') + expect(modules['virtual component']).not.toContain('side-effect-marker') + expect(modules['virtual errorComponent']).not.toContain( + 'side-effect-marker', + ) + await expectValidModules(modules) + }) + + // TypeScript erases type positions, so a declaration whose binding only + // appears in a type is still live code that runs when the route loads. + it.each([ + { + name: 'the reference module', + compile: (code: string) => compileRouteModules(code).modules.reference!, + }, + { + name: 'a route module compiled for HMR', + compile: (code: string) => transformWithRouteHmrPlugin(code), + }, + ])( + 'keeps a declaration only referenced from types in $name', + async ({ compile }) => { + const output = + compile(`${head}import { registerAnalytics } from './analytics' +const analytics = registerAnalytics('/posts') +declare module './analytics' { + interface Registry { + posts: typeof analytics + } +} +export const Route = createFileRoute('/posts')({ + component: () =>

posts

, +}) +`) + expect(output).toMatch(declarationOf('analytics')) + expect(output).toContain('registerAnalytics(') + await expectValidModules({ output }) + }, + ) +}) + +describe('code a split option needs moves with it', () => { + // Source: Qwik optimizer test.rs should_not_move_over_side_effects, + // example_drop_side_effects; Turbopack tree-shaker analyzer/route-kind + it.each([ + { + name: 'a compound component member assignment', + setup: `function Card({ children }) { return
{children}
} +Card.Title = function Title() { return

t

}`, + render: '', + rendered: '

t

', + }, + { + name: 'a registry filled by a top-level call', + setup: `const registry = new Map() +registry.set('a', 'A')`, + render: `

{registry.get('a')}

`, + rendered: '

A

', + }, + { + name: 'a compiled enum initializing a var', + setup: `var Kind: any +;(function (Kind: any) { + Kind['A'] = 'a' +})(Kind || (Kind = {}))`, + render: '

{Kind.A}

', + rendered: '

a

', + }, + ])( + 'renders a split component that relies on $name', + async ({ setup, render, rendered }) => { + const { modules } = compileRouteModules(`${head}${setup} +export const Route = createFileRoute('/')({ + component: () => ${render}, +}) +`) + await expectValidModules(modules) + expect(await renderSplitComponent(modules)).toBe(rendered) + }, + ) + + // Source: React Compiler hook-ref-callback.js and + // dont-memoize-primitive-function-call-non-escaping.js: a function shared by + // the loader and the split component declares a local it never reads. + it.each([ + { name: 'a call', initializer: 'track(id)' }, + { name: 'an optional call', initializer: 'track?.(id)' }, + ])( + 'keeps an unused local initialized by $name in a shared function', + async ({ initializer }) => { + const { modules } = + compileRouteModules(`${head}import { track } from './track' +function useShared(id) { + const unused = ${initializer} + return id +} +export const Route = createFileRoute('/')({ + loader: () => useShared('loader'), + component: () =>

{useShared('component')}

, +}) +`) + const calls: Array = [] + const shared = await evaluateModule(modules.shared!, { + './track': { track: (label: string) => calls.push(label) }, + }) + expect(shared.useShared!('render')).toBe('render') + expect(calls).toEqual(['render']) + }, + ) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "object + // pattern" > "within function param" + it('keeps empty destructuring parameters of helpers moved into the chunk', async () => { + const { modules } = + compileRouteModules(`${head}function f(a: any, {}: any) { return a } +const g = (a: any, []: any) => a +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{f.length}{g.length}

, +}) +`) + const chunk = await evaluateModule(modules['virtual component']!) + expect(chunk.component!()).toBe('

22

') + }) + + // Source: React Router remove-exports-test.ts "iife with dependencies" + it('moves a component created by an IIFE with its dependencies and shares the helper the loader uses too', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { removedLib } from 'removed-lib' +import { keptLib } from 'kept-lib' +import { sharedLib } from 'shared-lib' +const sharedUtil = (value?: unknown) => sharedLib(value) +const removedUtil = () => sharedUtil(removedLib()) +const keptUtil = () => sharedUtil(keptLib()) +const Page = (() => { + const message = removedUtil() + return () =>
{String(message)}
+})() +export const Route = createFileRoute('/')({ + loader: () => keptUtil(), + component: Page, +}) +`) + expect(sharedBindings).toEqual(['sharedUtil']) + expect(importSources(modules.reference!)).toEqual([ + '@tanstack/react-router', + 'kept-lib', + 'route.tsx?tsr-shared=1', + ]) + expect(modules.reference).not.toContain('removedUtil') + expect(importSources(modules['virtual component']!)).toEqual([ + 'removed-lib', + 'route.tsx?tsr-shared=1', + ]) + expect(modules['virtual component']).toMatch(declarationOf('Page')) + expect(importSources(modules.shared!)).toEqual(['shared-lib']) + await expectValidModules(modules) + }) + + // Source: React Router route-chunks-test.ts "isolated exported variable + // declarations sharing an export statement"; Next.js + // ssg/getStaticProps/should-remove-re-exported-variable-declarations-safe + it.each([ + { + name: 'plain declarators', + declarations: `const Page = () =>
{chunkMessage}
, + main = mainMessage`, + }, + { + name: 'destructured declarators', + declarations: `const { Page } = { Page: () =>
{chunkMessage}
}, + { main } = { main: mainMessage }`, + }, + ])( + 'gives each of the $name of one statement to the module that reads it', + async ({ declarations }) => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { chunkMessage, mainMessage } from './messages' +${declarations} +export const Route = createFileRoute('/')({ + loader: () => main, + component: Page, +}) +`) + expect(sharedBindings).toEqual([]) + expect(importedNames(modules.reference!, './messages')).toEqual([ + 'mainMessage', + ]) + expect(modules.reference).not.toMatch(/\bPage\b/) + expect( + importedNames(modules['virtual component']!, './messages'), + ).toEqual(['chunkMessage']) + expect(modules['virtual component']).not.toMatch(/\bmain\b/) + await expectValidModules(modules) + }, + ) + + // Source: React Router route-chunks-test.ts "exported variable declarations + // sharing an export statement" + it('shares a declarator that a sibling declarator reads', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { sharedMessage } from './messages' +const Page = () =>
{sharedMessage}
, + Preview = Page +export const Route = createFileRoute('/')({ + loader: () => Preview.name, + component: Page, +}) +`) + expect(sharedBindings).toEqual(['Page']) + expect(modules.shared).toMatch(declarationOf('Page')) + expect(modules.reference).toMatch(declarationOf('Preview')) + expect(importedNames(modules.reference!, sharedModule)).toEqual(['Page']) + expect(modules.reference).not.toMatch(declarationOf('Page')) + expect(modules['virtual component']).not.toMatch(declarationOf('Page')) + await expectValidModules(modules) + }) +}) + +describe('var declarations nested in top-level statements', () => { + it.each([ + { + name: 'a for loop head', + setup: 'for (var value = 0; value < 3; value++) {}', + }, + { name: 'a for-of head', setup: "for (var value of ['a']) {}" }, + { + name: 'an if block', + setup: "if (typeof window === 'undefined') { var value = 'server' }", + }, + ])( + 'stay bound in every module when $name declares a binding the loader and the component read', + async ({ setup }) => { + const { modules } = compileRouteModules(`${head}${setup} +export const Route = createFileRoute('/')({ + loader: () => value, + component: () =>
{value}
, +}) +`) + // Known limitation on main: the statement runs in both modules instead + // of once in the shared module; only check that each module binds `value`. + for (const name of ['reference', 'virtual component']) { + expect(binds(modules[name]!, 'value'), `${name} binds value`).toBe(true) + } + await expectValidModules(modules) + }, + ) + + it('stay bound in the reference module when exported and read by the component', async () => { + const { modules } = + compileRouteModules(`${head}if (typeof window === 'undefined') { var flag = 'server' } +export { flag } +export const Route = createFileRoute('/')({ + component: () =>
{flag}
, +}) +`) + expect(binds(modules.reference!, 'flag')).toBe(true) + await expectValidModules(modules) + }) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "variable" + // (var bindings declared inside nested statements) + it('follow the only option that reads them', async () => { + const { modules } = + compileRouteModules(`${head}import { compute, connect } from './lib' +if (typeof window !== 'undefined') { + var flag = compute() +} +for (var index = 0; index < 3; index++) {} +{ + var block = connect() +} +export const Route = createFileRoute('/')({ + loader: () => block, + component: () =>

{String(flag)}{index}

, +}) +`) + expect(modules.reference).not.toContain('compute()') + expect(modules.reference).toMatch(declarationOf('block')) + const chunk = modules['virtual component']! + expect(chunk).toMatch(declarationOf('flag')) + expect(chunk).toMatch(declarationOf('index')) + expect(chunk).not.toContain('connect()') + await expectValidModules(modules) + }) +}) + +describe('robustness', () => { + it('compiles a route with a long method chain', async () => { + // Builder APIs (schemas, query builders) produce deep left-nested calls + const chain = Array.from({ length: 200 }, (_, i) => `.add(${i})`).join('') + const { modules } = + compileRouteModules(`${head}import { builder } from './builder' +const schema = builder()${chain} +export const Route = createFileRoute('/')({ + loader: () => schema, + component: () =>
{String(schema)}
, +}) +`) + expect(modules.shared).toContain('.add(199)') + await expectValidModules(modules) + }) +}) diff --git a/packages/router-plugin/tests/code-splitter-imports-exports.test.ts b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts new file mode 100644 index 0000000000..e7c7a504d3 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts @@ -0,0 +1,359 @@ +import { transformWithOxc } from 'vite' +import { describe, expect, it } from 'vitest' +import { + buildAndRun, + compileRouteModules, + componentChunk, + declarationOf, + evaluateModule, + expectValidModules, + exportedNames, + head, + importSources, + importedNames, + transformWithRouteHmrPlugin, +} from './regression-helpers' + +describe('each module imports only the specifiers it reads', () => { + // Source: React Router route-chunks-test.ts "functions referencing their own + // identifiers"; babel-dead-code-elimination dead-code-elimination.test.ts + // "import" > "mixed default and named" and "namespace" + it('splits default, named and namespace specifiers between the modules', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import defaultMessage, { targetMessage, otherMessage } from './messages' +import * as messages from './messages' +import other, * as ns from './other' +const getDefault = () => defaultMessage +const getTarget = () => targetMessage +const getOther = () => otherMessage +function getNamespaced() { + return messages.namespaced +} +export const Route = createFileRoute('/')({ + loader: () => [getOther(), other], + component: () =>
{getDefault()}{ns.x}
, + errorComponent: () =>
{getNamespaced()}
, + notFoundComponent: () =>
{getTarget()}
, +}) +`) + expect(sharedBindings).toEqual([]) + const imports = (module: string, source: string) => + importedNames(modules[module]!, source) + expect(imports('reference', './messages')).toEqual(['otherMessage']) + expect(imports('reference', './other')).toEqual(['default']) + expect(imports('virtual component', './messages')).toEqual(['default']) + expect(imports('virtual component', './other')).toEqual(['*']) + expect(imports('virtual errorComponent', './messages')).toEqual(['*']) + expect(imports('virtual notFoundComponent', './messages')).toEqual([ + 'targetMessage', + ]) + await expectValidModules(modules) + }) + + it('moves a specifier with a string name into the chunk', async () => { + const { modules } = + compileRouteModules(`${head}import { "kebab-name" as Kebab } from './icons' +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () => , +}) +`) + expect(importedNames(modules['virtual component']!, './icons')).toEqual([ + 'kebab-name', + ]) + expect(importSources(modules.reference!)).not.toContain('./icons') + await expectValidModules(modules) + }) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "import" > + // "mixed default and named: none used" and "side-effect" + it('removes an import whose specifiers all moved instead of leaving a side-effect import', async () => { + const code = `${head}import a, { b } from 'pkg' +import './styles.css' +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{a}{b}

, +}) +` + const { modules } = compileRouteModules(code) + // React HMR rewrites the reference module before unused code is removed. + const hmrReference = compileRouteModules(code, { hmr: true }).modules + .reference! + for (const reference of [modules.reference!, hmrReference]) { + expect(importSources(reference)).toContain('./styles.css') + expect(importSources(reference)).not.toContain('pkg') + } + expect(importedNames(modules['virtual component']!, 'pkg')).toEqual([ + 'b', + 'default', + ]) + await expectValidModules(modules) + }) + + // With React's classic JSX runtime (`jsx: "react"` in tsconfig), JSX + // compiles to `React.createElement`, so a React import that the TypeScript + // code only uses in types must stay. + it.each([ + { name: 'split chunk', compile: componentChunk }, + { + name: 'route module compiled for HMR', + compile: (code: string) => transformWithRouteHmrPlugin(code), + }, + ])( + 'keeps the React import of the $name for classic JSX', + async ({ compile }) => { + const output = compile(`import * as React from 'react' +${head}function Page({ title = 'classic' }: { title?: React.ReactNode }) { + return

{title}

+} +export const Route = createFileRoute('/')({ component: Page }) +`) + const { code } = await transformWithOxc(output, 'module.tsx', { + jsx: { runtime: 'classic' }, + }) + expect(importedNames(code, 'react')).toEqual(['*']) + }, + ) +}) + +describe('exports of the route file', () => { + it.each([ + { name: 'as-is', exports: 'export { Foo }' }, + { name: 'renamed', exports: 'export { Foo as Bar }' }, + ])( + 'are not redeclared when they re-export an import $name', + async ({ exports }) => { + const { modules } = + compileRouteModules(`${head}import { Foo } from './foo' +${exports} +export const Route = createFileRoute('/')({ component: Page }) +function Page() { + return +} +`) + await expectValidModules(modules) + }, + ) + + it('are not redeclared when destructured next to a non-exported binding', async () => { + const { modules } = compileRouteModules(`${head}const { a, b } = getStuff() +export { a } +export const Route = createFileRoute('/')({ + component: () =>
{a}{b}
, +}) +`) + await expectValidModules(modules) + }) + + it.each([ + { name: 'function', declaration: 'function () {\n return null\n}' }, + { name: 'class', declaration: 'class {\n x = 1\n}' }, + ])( + 'keep an anonymous default-exported $name valid in every module', + async ({ declaration }) => { + const { modules } = compileRouteModules(`${head}const cache = new Map() +function Page() { + return
{cache.size}
+} +export const Route = createFileRoute('/')({ + loader: () => cache.get('x'), + component: Page, +}) +export default ${declaration} +`) + expect(Object.keys(modules)).toContain('shared') + await expectValidModules(modules) + }, + ) + + // Source: Next.js ssg/getStaticProps/issue-31855 and multi-declarator-export + it('are imported by the chunk when declared in one statement', async () => { + const { modules } = compileRouteModules(`${head}export const a = 1, + b = 2 +export const Route = createFileRoute('/')({ + component: () =>
{a + b}
, +}) +`) + expect(exportedNames(modules.reference!)).toEqual(['Route', 'a', 'b']) + const chunk = modules['virtual component']! + // From the route module, or from the shared module the route module + // re-exports them from. + expect( + [ + ...importedNames(chunk, 'route.tsx'), + ...importedNames(chunk, 'route.tsx?tsr-shared=1'), + ].sort(), + ).toEqual(['a', 'b']) + expect(chunk).not.toMatch(declarationOf('a')) + expect(chunk).not.toMatch(declarationOf('b')) + await expectValidModules(modules) + }) + + it('keep module-level re-exports in the reference module', async () => { + const { modules } = compileRouteModules(`${head}export * from './lib' +export * as lib from './lib' +export {} +const cache = new Map() +export const Route = createFileRoute('/')({ + loader: () => cache.size, + component: () =>
{cache.size}
, +}) +`) + expect(modules.reference).toMatch(/export \* from ['"]\.\/lib['"]/) + expect(modules.reference).toMatch(/export \* as lib from ['"]\.\/lib['"]/) + await expectValidModules(modules) + }) +}) + +describe('TypeScript-only syntax', () => { + it('erases type-only imports and exports from the split modules', async () => { + const { modules } = + compileRouteModules(`${head}import type { User } from './types' +import { type Settings, defaults } from './settings' +export type * from './types' +export type { User } +const current: User | Settings = defaults +export const Route = createFileRoute('/')({ + loader: () => current, + component: () =>
{String(current)}
, +}) +`) + expect(importedNames(modules['virtual component']!, './types')).toEqual([]) + expect(importedNames(modules.shared!, './types')).toEqual([]) + expect(importedNames(modules.shared!, './settings')).toEqual(['defaults']) + await expectValidModules(modules) + }) + + // Ambient declarations (`declare ...`) have no runtime binding: the + // environment provides the value (a ', + 'entry.js': "import './root.css'; import('./component.js')", + 'component.js': + "import './component.module.css'; import './unused.css?inline'", + 'root.css': '@import "./base.css"; .root { color: red; }', + 'base.css': '.base { --base-marker: 1; }', + 'component.module.css': '.component { --component-marker: 1; }', + 'unused.css': '.unused { --unused-marker: 1; }', + }).map(([file, code]) => writeFile(path.join(root, file), code)), + ) + let snapshot: ReturnType | undefined + const completed = Promise.withResolvers() + const server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + experimental: { bundledDev: true }, + build: { rolldownOptions: { experimental: { devMode: { lazy: false } } } }, + optimizeDeps: { noDiscovery: true }, + server: { port: 0 }, + plugins: [ + { + name: 'capture-completed-styles', + generateBundle() { + // Rolldown module ids use forward slashes, also on Windows. + if (!this.getModuleInfo(normalizePath(path.join(root, 'entry.js')))) { + return + } + snapshot = captureBundledDevStyles(this, root) + completed.resolve() + }, + }, + ], + }) + try { + await server.listen() + const address = server.httpServer!.address() + if (!address || typeof address === 'string') { + throw new Error('Expected the dev server to listen on a TCP port') + } + await fetch(`http://localhost:${address.port}/`) + await completed.promise + const css = collectBundledDevStyles(snapshot, [path.join(root, 'entry.js')]) + expect(css).toContain('/* /root.css */') + expect(css).toContain('/* /component.module.css */') + expect(css?.match(/--base-marker/g)).toHaveLength(1) + expect(css).toContain('--component-marker') + expect(css).not.toContain('--unused-marker') + expect(css!.indexOf('/* /root.css */')).toBeLessThan( + css!.indexOf('/* /component.module.css */'), + ) + expect( + collectBundledDevStyles(snapshot, [path.join(root, 'unknown.js')]), + ).toBeUndefined() + } finally { + await server.close() + await rm(root, { recursive: true, force: true }) + } +}, 20_000) diff --git a/packages/start-plugin-core/tests/vite/dev-styles.test.ts b/packages/start-plugin-core/tests/vite/dev-styles.test.ts new file mode 100644 index 0000000000..da355b74c2 --- /dev/null +++ b/packages/start-plugin-core/tests/vite/dev-styles.test.ts @@ -0,0 +1,644 @@ +import { describe, expect, test } from 'vitest' +import { + collectDevStyles, + fetchCssFromModule, +} from '../../src/vite/dev-server-plugin/dev-styles' +import type { EnvironmentModuleNode } from 'vite' + +function createCssNode(url: string, css: string): EnvironmentModuleNode { + return { + url, + file: `/app${url}`, + importedModules: new Set(), + transformResult: { + code: `const __vite__css = ${JSON.stringify(css)}`, + }, + } as EnvironmentModuleNode +} + +function createEntryNode( + url: string, + depUrl: string | Array, +): EnvironmentModuleNode { + return { + url, + file: `/app${url}`, + importedModules: new Set(), + transformResult: { + deps: Array.isArray(depUrl) ? depUrl : [depUrl], + }, + } as EnvironmentModuleNode +} + +describe('collectDevStyles', () => { + test('recognizes virtual Vue style blocks by URL', async () => { + const styleUrl = '/src/App.vue?vue&type=style&index=0&lang.css' + const entry = createEntryNode('/src/entry.tsx', styleUrl) + const vueStyle = createCssNode(styleUrl, '.vue-style {}') + vueStyle.file = '/app/src/App.vue' + const importedCss = createCssNode('/src/imported.css', '.imported {}') + vueStyle.transformResult!.deps = [importedCss.url] + vueStyle.importedModules.add(importedCss) + const modules = new Map( + [entry, vueStyle, importedCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain(`/* ${styleUrl} */`) + expect(css).toContain('.vue-style {}') + expect(css).not.toContain('/* /src/imported.css */') + }) + + test('does not traverse dependencies of CSS files', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/importer.css') + const importerCss = createCssNode( + '/src/importer.css', + '.dep-imported {}\n.module-imported {}\n.importer {}', + ) + const depImportedCss = createCssNode( + '/src/dep-imported.css', + '.dep-imported {}', + ) + const moduleImportedCss = createCssNode( + '/src/module-imported.css', + '.module-imported {}', + ) + importerCss.transformResult!.deps = [depImportedCss.url] + importerCss.importedModules.add(moduleImportedCss) + const modules = new Map( + [entry, importerCss, depImportedCss, moduleImportedCss].map((node) => [ + node.url, + node, + ]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain('/* /src/importer.css */') + expect(css).not.toContain('/* /src/dep-imported.css */') + expect(css).not.toContain('/* /src/module-imported.css */') + }) + + test('loads CSS modules from the client environment', async () => { + const serverEntry = createEntryNode( + '/src/entry.tsx', + '/src/route.module.css', + ) + const serverCssModule = createCssNode( + '/src/route.module.css', + '.server-transform {}', + ) + const clientCssModule = createCssNode( + '/src/route.module.css', + '.client-transform {}', + ) + const serverModules = new Map( + [serverEntry, serverCssModule].map((node) => [node.url, node]), + ) + const clientModules = new Map([[clientCssModule.url, clientCssModule]]) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.client-transform {}') + expect(css).not.toContain('.server-transform {}') + }) + + test('traverses code-split modules that are only in importedModules', async () => { + const entry = createEntryNode('/src/entry.tsx', []) + const splitModule = createEntryNode( + '/src/entry.tsx?tsr-split=component', + '/src/code-split.css', + ) + const splitCss = createCssNode('/src/code-split.css', '.code-split {}') + entry.importedModules.add(splitModule) + const modules = new Map( + [entry, splitModule, splitCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain('/* /src/code-split.css */') + expect(css?.match(/\.code-split \{\}/g)).toHaveLength(1) + }) + + test('preserves entry order when graph lookups finish out of order', async () => { + const rootEntry = createEntryNode('/src/root.tsx', '/src/root.css') + const routeEntry = createEntryNode('/src/route.tsx', '/src/route.css') + const rootCss = createCssNode('/src/root.css', '.root {}') + const routeCss = createCssNode('/src/route.css', '.route {}') + + const modules = new Map( + [rootEntry, routeEntry, rootCss, routeCss].map((node) => [ + node.url, + node, + ]), + ) + const moduleGraph = { + async getModuleByUrl(url: string) { + if (url === rootEntry.url) { + await new Promise((resolve) => setTimeout(resolve, 20)) + } + return modules.get(url) + }, + } + const environment = { + moduleGraph, + async transformRequest() { + return null + }, + } + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/root.tsx', '/app/src/route.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toBeDefined() + expect(css!.indexOf('/* /src/root.css */')).toBeLessThan( + css!.indexOf('/* /src/route.css */'), + ) + }) + + test('preserves dependency order while resolving dependencies in parallel', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/first.css', + '/src/second.css', + ]) + const firstCss = createCssNode('/src/first.css', '.first {}') + const secondCss = createCssNode('/src/second.css', '.second {}') + const modules = new Map( + [entry, firstCss, secondCss].map((node) => [node.url, node]), + ) + + let firstLookupFinished = false + let secondStartedBeforeFirstFinished = false + const moduleGraph = { + async getModuleByUrl(url: string) { + if (url === firstCss.url && !firstLookupFinished) { + await new Promise((resolve) => setTimeout(resolve, 20)) + firstLookupFinished = true + } + if (url === secondCss.url && !firstLookupFinished) { + secondStartedBeforeFirstFinished = true + } + return modules.get(url) + }, + } + const environment = { + moduleGraph, + async transformRequest() { + return null + }, + } + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(secondStartedBeforeFirstFinished).toBe(true) + expect(css).toContain('/* /src/first.css */') + expect(css).toContain('/* /src/second.css */') + expect(css!.indexOf('/* /src/first.css */')).toBeLessThan( + css!.indexOf('/* /src/second.css */'), + ) + }) + + test('preserves CSS order while loading regular and module CSS in parallel', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/root.css', + '/src/route.module.css', + ]) + const rootCss = createCssNode('/src/root.css', '') + const routeCss = createCssNode('/src/route.module.css', '') + const modules = new Map( + [entry, rootCss, routeCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + let rootFinished = false + let routeStartedBeforeRootFinished = false + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: async (url) => { + if (url === rootCss.url) { + await new Promise((resolve) => setTimeout(resolve, 20)) + rootFinished = true + return '.root {}' + } + if (!rootFinished) { + routeStartedBeforeRootFinished = true + } + return '.route {}' + }, + }) + + expect(routeStartedBeforeRootFinished).toBe(true) + expect(css!.indexOf('/* /src/root.css */')).toBeLessThan( + css!.indexOf('/* /src/route.module.css */'), + ) + }) + + test('handles cycles and coalesces shared dependency lookups', async () => { + const firstEntry = createEntryNode('/src/first.tsx', [ + '/src/first.css', + 'external-package', + '/src/shared.css', + ]) + const secondEntry = createEntryNode('/src/second.tsx', [ + '/src/second.css', + 'external-package', + '/src/shared.css', + ]) + const firstCss = createCssNode('/src/first.css', '.first {}') + const secondCss = createCssNode('/src/second.css', '.second {}') + const sharedCss = createCssNode('/src/shared.css', '.shared {}') + firstEntry.importedModules.add(secondEntry) + secondEntry.importedModules.add(firstEntry) + const modules = new Map( + [firstEntry, secondEntry, firstCss, secondCss, sharedCss].map((node) => [ + node.url, + node, + ]), + ) + const lookupCounts = new Map() + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + lookupCounts.set(url, (lookupCounts.get(url) ?? 0) + 1) + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/first.tsx', '/app/src/second.tsx'], + loadCssContents: async (url) => `.${url.split('/').at(-1)} {}`, + }) + + expect(lookupCounts.get('external-package')).toBe(1) + expect(lookupCounts.get('/src/shared.css')).toBe(1) + expect(css?.match(/\/\* \/src\/shared\.css \*\//g)).toHaveLength(1) + expect(css!.indexOf('/* /src/first.css */')).toBeLessThan( + css!.indexOf('/* /src/shared.css */'), + ) + expect(css!.indexOf('/* /src/shared.css */')).toBeLessThan( + css!.indexOf('/* /src/second.css */'), + ) + }) + + test('refreshes the graph and client CSS after invalidation', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/old.css') + const oldServerCss = createCssNode('/src/old.css', '') + const newServerCss = createCssNode('/src/new.css', '') + const oldClientCss = createCssNode('/src/old.css', '.old {}') + const newClientCss = createCssNode('/src/new.css', '.new {}') + const newClientTransform = newClientCss.transformResult! + newClientCss.transformResult = null + + const serverModules = new Map( + [entry, oldServerCss, newServerCss].map((node) => [node.url, node]), + ) + const clientModules = new Map( + [oldClientCss, newClientCss].map((node) => [node.url, node]), + ) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === entry.url) { + entry.transformResult = { + code: '', + map: null, + deps: [newServerCss.url], + } + } + return entry.transformResult + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === newClientCss.url) { + newClientCss.transformResult = newClientTransform + return newClientTransform + } + return null + }, + } + const options = { + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => + fetchCssFromModule(clientEnvironment, url), + } + + const initialCss = await collectDevStyles(options) + entry.transformResult = null + const invalidatedCss = await collectDevStyles(options) + + expect(initialCss).toContain('.old {}') + expect(invalidatedCss).toContain('.new {}') + expect(invalidatedCss).not.toContain('.old {}') + }) + + test('refreshes cached CSS when the same URL is invalidated', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/route.css') + const serverCss = createCssNode('/src/route.css', '') + const clientCss = createCssNode('/src/route.css', '.old {}') + const serverModules = new Map( + [entry, serverCss].map((node) => [node.url, node]), + ) + const clientModules = new Map([[clientCss.url, clientCss]]) + const newTransform = { + code: `const __vite__css = ${JSON.stringify('.new {}')}`, + map: null, + } + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === clientCss.url) { + clientCss.transformResult = newTransform + return newTransform + } + return null + }, + } + const options = { + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => + fetchCssFromModule(clientEnvironment, url), + } + + const initialCss = await collectDevStyles(options) + clientCss.transformResult = null + const invalidatedCss = await collectDevStyles(options) + + expect(initialCss).toContain('.old {}') + expect(invalidatedCss).toContain('.new {}') + expect(invalidatedCss).not.toContain('.old {}') + }) + + test('snapshots importedModules before awaiting dependency lookups', async () => { + const entry = createEntryNode('/src/entry.tsx', 'slow-dependency') + const initialCss = createCssNode('/src/initial.css', '.initial {}') + const lateCss = createCssNode('/src/late.css', '.late {}') + entry.importedModules.add(initialCss) + const modules = new Map( + [entry, initialCss, lateCss].map((node) => [node.url, node]), + ) + let notifyLookupStarted!: () => void + let finishLookup!: () => void + const lookupStarted = new Promise((resolve) => { + notifyLookupStarted = resolve + }) + const lookupCanFinish = new Promise((resolve) => { + finishLookup = resolve + }) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + if (url === 'slow-dependency') { + notifyLookupStarted() + await lookupCanFinish + } + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const options = { + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => fetchCssFromModule(environment, url), + } + + const inFlightCollection = collectDevStyles(options) + await lookupStarted + entry.importedModules.add(lateCss) + finishLookup() + const inFlightCss = await inFlightCollection + const nextCss = await collectDevStyles(options) + + expect(inFlightCss).toContain('.initial {}') + expect(inFlightCss).not.toContain('.late {}') + expect(nextCss).toContain('.late {}') + }) + + test('keeps other styles when a CSS transform fails', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/good.css', + '/src/partial.scss', + ]) + const goodServerCss = createCssNode('/src/good.css', '') + const partialServerCss = createCssNode('/src/partial.scss', '') + const goodClientCss = createCssNode('/src/good.css', '.good {}') + const partialClientCss = createCssNode('/src/partial.scss', '') + partialClientCss.transformResult = null + const serverModules = new Map( + [entry, goodServerCss, partialServerCss].map((node) => [node.url, node]), + ) + const clientModules = new Map( + [goodClientCss, partialClientCss].map((node) => [node.url, node]), + ) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === partialClientCss.url) { + throw new Error('Sass partial cannot compile in isolation') + } + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.good {}') + expect(css).not.toContain('partial.scss') + }) + + test('does not traverse modules that exist only in the client graph', async () => { + const ssrRoot = createEntryNode('/src/root.tsx', '/src/root.css') + const ssrRootCss = createCssNode('/src/root.css', '') + const ssrModules = new Map( + [ssrRoot, ssrRootCss].map((node) => [node.url, node]), + ) + + const clientRoot = createEntryNode('/src/root.tsx', '/src/root.css') + const clientRootCss = createCssNode('/src/root.css', '.root {}') + const clientOnlyModule = createEntryNode( + '/src/client-only.ts', + '/src/client-only.css', + ) + const clientOnlyCss = createCssNode( + '/src/client-only.css', + '.client-only {}', + ) + clientRoot.importedModules.add(clientOnlyModule) + const clientModules = new Map( + [clientRoot, clientRootCss, clientOnlyModule, clientOnlyCss].map( + (node) => [node.url, node], + ), + ) + + const createEnvironment = ( + modules: Map, + ) => ({ + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + }) + const clientEnvironment = createEnvironment(clientModules) + const ssrEnvironment = createEnvironment(ssrModules) + + const css = await collectDevStyles({ + serverEnvironment: ssrEnvironment, + rootDirectory: '/app', + entries: ['/app/src/root.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.root {}') + expect(css).not.toContain('.client-only {}') + }) +}) diff --git a/packages/start-plugin-core/vite.config.ts b/packages/start-plugin-core/vite.config.ts index 39b3e69a9d..0b33045be3 100644 --- a/packages/start-plugin-core/vite.config.ts +++ b/packages/start-plugin-core/vite.config.ts @@ -1,13 +1,40 @@ -import { defineConfig, mergeConfig } from 'vitest/config' +import { configDefaults, defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' import packageJson from './package.json' +/** The build output (`dist`) of this package and `@tanstack/react-start`. */ +const builtStartPackages = + /\/packages\/(?:start-plugin-core|react-start)\/dist\// + const config = defineConfig({ test: { name: packageJson.name, dir: './tests', watch: false, - typecheck: { enabled: true }, + projects: [ + { + // `test:unit` + extends: true, + test: { + name: 'unit', + exclude: [...configDefaults.exclude, 'integration/**'], + typecheck: { enabled: true }, + }, + }, + { + // `test:integration`: real builds and dev servers of Start apps + // (`tests/integration/start-app.ts`), with the built Start packages. + // Node loads them, as it loads an installed package, so the plugin + // and the loaders Rspack loads from the same `dist` share one module + // instance. + extends: true, + test: { + name: 'integration', + include: ['integration/**/*.test.ts'], + server: { deps: { external: [builtStartPackages] } }, + }, + }, + ], }, }) diff --git a/packages/start-server-core/AGENTS.md b/packages/start-server-core/AGENTS.md index ae178f35b6..af5046c332 100644 --- a/packages/start-server-core/AGENTS.md +++ b/packages/start-server-core/AGENTS.md @@ -1,6 +1,6 @@ # Start server runtime - Keep request assets out of cached manifests. Assets may mutate in place between head and Scripts rendering; compose their current contents without caching solely by object identity. Asset transforms must preserve the base manifest; request-dependent transforms use `cache: false`. -- Middleware can replace or wrap an SSR response before its body is read. Preserve response ownership with the existing `SsrResponse` helpers and `transferResponseBodyOwnership`; dispose abandoned bodies, and consume/cancel unused clone or tee branches. Rendering completion, serialization completion, and request cleanup are separate lifecycles; read [`../router-core/src/ssr/STREAMING.md`](../router-core/src/ssr/STREAMING.md) before changing them. +- Middleware can replace or wrap an SSR response before its body is read. Preserve response ownership with the existing `SsrResponse` helpers: a returned response continues the owned body when it has the same body stream or the owned body is locked (a pipe, tee, or `Response` copy that reads it). Dispose only unread abandoned bodies, and consume/cancel unused clone or tee branches. Rendering completion, serialization completion, and request cleanup are separate lifecycles; read [`../router-core/src/ssr/STREAMING.md`](../router-core/src/ssr/STREAMING.md) before changing them. - Merge client-sent context with `safeObjectMerge`, placing trusted server middleware context last. Preserve this precedence for JSON, GET, FormData, and direct SSR calls; validate through the `server-functions-global-middleware` e2e suite. - Changes to `src/frame-protocol.ts` must remain compatible with `../start-client-core/src/client-rpc/frame-decoder.ts`. Keep both packages' framing tests and relevant RawStream e2e coverage. diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 87db4bb072..fe54531e58 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,96 @@ # @tanstack/start-server-core +## 1.169.45 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/start-client-core@1.170.39 + - @tanstack/start-storage-context@1.167.41 + +## 1.169.44 + +### Patch Changes + +- [#8212](https://github.com/TanStack/router/pull/8212) [`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031) - Render generated script preloads (`modulepreload`, or `preload as="script"` for IIFE output) with `fetchPriority="low"` and forward it into static Early Hints, so they no longer compete with render-blocking stylesheets, fonts and images. + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/start-client-core@1.170.38 + - @tanstack/start-storage-context@1.167.40 + +## 1.169.43 + +### Patch Changes + +- [#8710](https://github.com/TanStack/router/pull/8710) [`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08) - Update `fetchdts` to `^0.2.0`. The typed request and response header helpers keep the same header names and value types. + +## 1.169.42 + +### Patch Changes + +- [#8451](https://github.com/TanStack/router/pull/8451) [`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8) - Skip request middleware bookkeeping when no request middleware is configured, and stop copying serialization adapters when the router adds none. + + Server route handlers and route middleware now receive the router's decoded pathname, the same one used for route matching. Characters that would change how the path is read, such as `%2F`, `%3F`, and `%23`, stay encoded. + +- [#8441](https://github.com/TanStack/router/pull/8441) [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82) - Reuse the parsed request location during SSR instead of repeating input rewrites. Match server routes against the app router's parsed pathname while preserving encoded pathnames for server handlers and middleware. + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-storage-context@1.167.39 + - @tanstack/router-core@1.171.37 + - @tanstack/start-client-core@1.170.37 + +## 1.169.41 + +### Patch Changes + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Return 400 Bad Request for malformed percent-encoded request pathnames before running server entry callbacks. Preserve valid encoded paths and query handling. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Reduce request middleware overhead, reuse loaded entries and transport header requirements, and avoid unnecessary URL normalization for server functions. Preserve response helper writes made during body cancellation and SSR cleanup. + + Avoid allocating absent middleware headers and reply context, and construct RPC redirects with their final response state. Preserve middleware accessor evaluation and the documented undefined value for absent `sendContext`. + + Reduce synchronous server-function response overhead while preserving cancellation cleanup and middleware response mutations. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Keep streaming a page when request middleware returns a response that reads the page body, such as a copy made through a wrapped global `Response`, a copy in Bun, or a body piped through a transform. Start now disposes a replaced page stream only when nothing reads it. `transferResponseBodyOwnership` is removed: return the derived response directly. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Let request middleware read the body of a `HEAD` response, and strip it when the response leaves the pipeline. Start no longer applies `Content-Encoding`, `Content-Length`, or other framing headers set through response helpers to error bodies and serialized server-function replies that it builds itself. A response that middleware assigns to `result.response` is now disposed when the middleware returns another response. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Remove the built-in `useSession` API. Applications choose a session library, such as iron-session, and save or destroy sessions explicitly before returning or redirecting. Connect a cookie adapter through `getCookie` and `setCookie`, or append serialized cookies with `appendResponseHeader('set-cookie', cookie)`. Existing session cookies require a deliberate migration or signing in again with a new cookie name. + + `createServerEntry` keeps the complete callback, including custom error handling, inside the request context and converts errors that escape it. The built-in entry still converts errors automatically. Raw `createStartHandler` handlers now rethrow the original error. For custom reporting, catch inside `createServerEntry`, then rethrow for default conversion or return `handleStartError(error)` to preserve response-helper status, headers, and cookies. Return an explicit `Response` when choosing a custom error payload. + + Response helpers now apply consistently across server routes, SSR, server functions, redirects, errors, and middleware response replacements. Helper setters override returned values; cookie helpers preserve independent cookies and replace matching cookie identities. Use `appendResponseHeader('set-cookie', cookie)` when adding a serialized cookie without replacing other cookies. Changed responses receive copied headers and reuse the body stream, so applications should inspect the response returned by Start rather than relying on mutation of the original response. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-storage-context@1.167.38 + - @tanstack/start-client-core@1.170.36 + +## 1.169.40 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + - @tanstack/start-client-core@1.170.35 + - @tanstack/start-storage-context@1.167.37 + +## 1.169.39 + +### Patch Changes + +- [#8573](https://github.com/TanStack/router/pull/8573) [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb) - Align server function request and response handling. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + - @tanstack/start-storage-context@1.167.36 + ## 1.169.38 ### Patch Changes diff --git a/packages/start-server-core/INTERNALS.md b/packages/start-server-core/INTERNALS.md index b759b33e5a..b2ac36ce80 100644 --- a/packages/start-server-core/INTERNALS.md +++ b/packages/start-server-core/INTERNALS.md @@ -16,39 +16,27 @@ Each request must use a separate router instance. Sharing one router between req Start keeps one ownership record for the current response body. A response without a body does not need an ownership record. -Ownership transfers automatically in these cases: +Ownership moves to the response that middleware returns in these cases: - Middleware returns the same `Response` object. - Middleware returns another `Response` with the same body object. +- Middleware returns another `Response` with a body while the current body is locked. -Web Streams do not expose the source of a different body. TypeScript also cannot describe this runtime relationship. +Web Streams do not expose the source of a different body. A lock is the only public sign that code reads the current body. A pipe or `tee()` locks it, and so does a `Response` constructor that copies a body by reading it, as in Bun or with a wrapped global `Response`. -Middleware must mark a response that has a different derived body: +A lock does not prove stream ancestry: a reader can also stop early. Start cannot tell that reader from a pipe, so it never disposes a locked body when middleware replaces it. Such a stream ends with the request's abort or the SSR stream's lifetime limit. -```ts -return transferResponseBodyOwnership( - response, - new Response(response.body!.pipeThrough(transform), response), -) -``` +Only the same body object keeps the transport headers that Start protects for serialized server-function replies. A different body can carry different bytes. -The first argument must be the current response. The second argument must contain a body derived directly from that response. - -The marker records one direct relationship. It does not connect the streams or manage their lifecycles. - -The derived body must propagate reads, completion, errors, and cancellation to the source body. A normal `pipeThrough()` chain has this behavior. - -Start stores markers in a `WeakMap`. An entry lives exactly as long as its derived response; a stale marker cannot cause a false transfer because ownership never returns to an older source. - -Normal responses do not create marker entries. The map does not keep an unreferenced derived response alive. +When Start rebuilds the current response to apply response helpers or restore protocol headers, the rebuilt response takes over the ownership record directly. Start does not compare bodies for its own rebuilds. ## Replacement and disposal -An unrelated response replaces the current ownership record. Start disposes the old record before it stores the replacement. +A response with an unrelated body replaces the current ownership record when nothing reads the current body. Start disposes the old record before it stores the replacement. For a Router SSR response, disposal releases Router SSR state and cancels the original SSR body. -If middleware returned a different derived body, disposal also cancels that final body. This cancellation propagates through a correct derived stream. +If ownership moved to a different body, disposal also cancels that final body. This cancellation propagates through a pipe. For a plain response, disposal cancels the current body. @@ -62,11 +50,11 @@ A result that settles after request cancellation is no longer usable. Start disp ## Locks, clones, and branches -A locked body only proves that code holds a reader or pipe. A lock does not prove ownership or stream ancestry. +Start checks the lock of the body that the current `Response` exposes when middleware returns a different response. Start cannot cancel a locked body through `body.cancel()`. The code that acquired the reader owns that reader and must cancel or release it. -`Response.clone()` creates two body branches. It can also change the body object exposed by the original `Response`. +`Response.clone()` creates two body branches. It can also change the body object exposed by the original `Response`. Middleware should return the original response and read the clone. When middleware returns the clone, Start sees the original branch and continues the stream only while that branch is being read. Start reads the current response body during disposal. It keeps only the original SSR body for Router cleanup. diff --git a/packages/start-server-core/docs/RECONCILIATION.md b/packages/start-server-core/docs/RECONCILIATION.md new file mode 100644 index 0000000000..3f3b49f88e --- /dev/null +++ b/packages/start-server-core/docs/RECONCILIATION.md @@ -0,0 +1,200 @@ +# Response Reconciliation + +This package owns request and response state for the TanStack Start server runtime. Applications choose their session library and connect it to Start's request and response cookie helpers. + +## Request State + +Every Start request runs inside a shared `AsyncLocalStorage` event. The event contains: + +- `request`: the original platform `Request` +- `requestUrl`: the parsed request URL, memoized so the framework parses each request URL only once +- `responseState`: lazily created mutable Start response state (`undefined` until the first helper write) +- `currentResponse`: the most recently reconciled response +- `responseHeaderAppends`: lazily created request-owned records of already-applied header appends + +The ALS instance is stored on a global symbol so separately bundled copies of this module share one request context. Helper state and append records belong to that invocation. Protocol protection describes the response body: its immutable snapshot is attached to Start-created responses through a non-enumerable global symbol. This protection follows the response through delegated requests, including cloned requests and separately bundled runtime copies. + +`createServerEntry` owns the scope around the complete entry callback, including custom error handling. Delegating through another wrapped entry or Start handler with the same `Request` object reuses that scope. A different `Request` object gets its own scope. + +Native helpers read directly from this event: + +- `getRequest` +- `getRequestHeaders` +- `getRequestHeader` +- `getRequestHost` +- `getRequestProtocol` +- `getRequestUrl` +- `getRequestIP` +- `getCookies` +- `getCookie` + +These helpers do not construct or read from an h3 event. + +## Response State + +Start response helpers mutate event-owned state, not `h3` state: + +- `setResponseStatus` +- `setResponseHeader` +- `setResponseHeaders` +- `appendResponseHeader` +- `removeResponseHeader` +- `clearResponseHeaders` +- `setCookie` +- `deleteCookie` + +Response state is created lazily on the first helper write. Requests that never call a response helper skip response-state allocation. Reconciliation still enforces bodyless response rules, and Start restores protocol headers when a server-function reply leaves the request middleware pipeline. + +`getResponseHeader` and `getResponseHeaders` read the current returned response plus helper overlay. Helper writes are visible immediately, even before a final `Response` exists. `getResponseHeaders()` returns a detached snapshot with a read-only TypeScript interface. Its `forEach` callback also receives that read-only interface. Casting the snapshot to `Headers` and mutating it does not change outgoing response state; outside production, `set`, `append`, and `delete` on the snapshot log a warning that lists the helpers to use instead. Use `setResponseHeader`, `setResponseHeaders`, `appendResponseHeader`, `removeResponseHeader`, or `clearResponseHeaders` for writes. Use `getSetCookie()` on the snapshot when all individual cookie values are needed. + +Internal code can use `getSerializedResponseState` to read the helper status and status text that apply to a serialized server-function reply. This is not public API and it is read-only; all writes go through the status/header/cookie helpers above. + +## Reconciliation Model + +Route handlers, middleware, SSR handlers, and server functions can all return `Response` objects. Start reconciles those responses with helper mutations before they cross each user middleware boundary. The request-scope wrapper only establishes or reuses the scope; it does not repeat reconciliation after the pipeline completes. Responses created outside the pipeline, including resolved redirects and server-function errors, are finalized at those creation points. + +When middleware replaces a body, or response status rules drop it, Start disposes the body before reading the helper state and recording applied appends. Synchronous cancellation and SSR cleanup callbacks can therefore contribute headers to the outgoing response. Eager router cleanup also finishes before final response publication. + +Reconciliation rules: + +- Helper state overlays returned `Response` state. +- Status and status text from `setResponseStatus` win over returned response status. +- Header replacement helpers win over returned response headers; append helpers retain the existing values. +- `removeResponseHeader` and `clearResponseHeaders` can remove headers from a returned response. +- Helper deltas survive when a later middleware replaces the response. +- Direct mutations to an old `response.headers` object do not survive response replacement. +- Direct mutations to the current response are visible while that response remains current. +- Reconciliation returns the original `Response` instance when its effective headers, status, status text, and body shape are unchanged. It still records which helper appends have been applied. +- If headers, status, or body shape change, reconciliation creates a new `Response` with copied headers and the same body stream, unless the body must be dropped. + +Reconciliation does not mutate a response supplied by application code, including a response reused across requests. It does not call `Response.clone()` or tee the body. The replacement becomes the body owner; application code must not also consume the original response's body. + +Router redirect responses keep their navigation options until Start resolves their destination and, for server-function RPC calls, creates the JSON redirect envelope. Generic response materialization runs after this step. While a redirect is pending, response getter helpers see the helper overlay, but direct reads of `result.response.headers` or `result.response.status` still see the unresolved redirect's own values. + +## Header Tracking + +Helper intent is recorded directly by the helper write functions: + +- `setResponseHeader`/`setResponseHeaders` record a helper write. +- `appendResponseHeader` records a helper write without replacing values. +- `removeResponseHeader` records a helper removal. +- `clearResponseHeaders()` records a full clear. + +This metadata matters because a plain `Headers` object cannot distinguish between "not set" and "explicitly removed". All response-state mutations flow through these module-level functions; the state object never escapes for direct mutation. + +For example, appending `Origin` to a response containing `Vary: Accept-Encoding` produces `Vary: Accept-Encoding, Origin`. Repeated reconciliation of that response does not repeat the append. A later append is applied once, and helper appends also apply when middleware replaces the response with a fresh response. + +An application-created response is a new explicit base. If middleware copies headers that already contain an applied helper append into a new response, that copied value is part of the new base and the helper append can appear again. Reuse the current response when it already contains the desired headers; returning a new response does not transfer Start's private append metadata. + +## Cookies + +Cookies use native `cookie-es` parsing and serialization. + +`setCookie` appends `Set-Cookie` values and dedupes by cookie identity: + +- name +- domain +- path + +If domain is absent, identity uses an empty domain. `setCookie` defaults to `Path=/`, but returned `Set-Cookie` headers without `Path` keep an empty path identity so they do not dedupe against explicit-path cookies. + +A `Set-Cookie` value that `cookie-es` cannot parse, for example one whose name is an `Object.prototype` key such as `constructor` or whose name and value exceed 4096 characters, is identified by its exact string. Only identical strings dedupe. + +Cookie behavior has two modes: + +- `setCookie`/`deleteCookie`/`appendResponseHeader('set-cookie', ...)`: merge with existing returned response cookies. +- `setResponseHeader('set-cookie', ...)`: replace returned response cookies. + +This preserves multiple `Set-Cookie` headers and lets explicit header APIs replace cookie state when requested. + +`appendResponseHeader('set-cookie', ...)` takes fully serialized cookie strings and merges them through the same identity dedupe as `setCookie`. It is the generic primitive for bridging external session/auth libraries that produce raw `Set-Cookie` strings. + +## Protected Transport Headers + +Server function protocol responses protect required header values and required absence: + +- Serialized JSON and framed results require their content type and `x-tss-serialized: true`, with `x-tss-raw` absent. +- Plain redirect and not-found JSON require JSON content type, with both incompatible transport markers absent. +- Explicit raw responses require `x-tss-raw: true`; their application content type is not protected. +- A non-redirect `Response` that a server function or its function middleware throws requires `x-tss-raw: thrown`, and the client rejects the call with it. Its application content type is not protected either. `fetch` follows a raw or thrown `Response` with a redirect status and `Location` before the client sees it, so navigation uses `redirect()`. + +Every serialized reply (JSON and framed results, errors, not-found envelopes, and RPC redirect envelopes) also requires `Location` to be absent, whether it comes from a helper, from error metadata, or from `notFound({ headers })`. The client decodes these replies from their body. Error replies always use an error status, but a helper can still select a 3xx status for other serialized replies, and an HTTP `Location` would then make fetch follow the redirect before the client decodes the reply. For redirect envelopes, the client reads the destination from the JSON `href`. Native form and document redirects still use `Location`. Helper status and status text control HTTP metadata, while the redirect's own `statusCode` remains in its Router navigation options. + +Other helper headers and cookies still reconcile onto server function responses. Replacing, removing, or clearing headers through the helpers cannot change protected protocol requirements. + +Middleware can also change protocol headers directly on `result.response`, including from a callback attached to the `next()` promise it returns. Start restores the protocol headers once, when the reply leaves the request middleware pipeline, so the client always receives them. Until then, outer middleware reading `result.response.headers` sees such a direct change, while `getResponseHeader` and `getResponseHeaders` always report the protocol values. Without request middleware, only Start has handled the reply, so nothing is checked. Start does not check at every middleware boundary because `Headers.get` validates each header name on every call, which made the check a measurable share of each server-function request. + +## Null Body Responses + +Reconciliation drops bodies for response shapes that cannot carry one: + +- `HEAD` requests +- status `204` +- status `205` +- status `304` + +Request middleware still sees the body of a `HEAD` response, so middleware that reads it to compute an `ETag` or `Content-Length` produces the same headers as for `GET`. Start strips a `HEAD` body once, when the response leaves the request middleware pipeline. + +`setResponseStatus` ignores codes that are not integers from `200` to `599`, such as informational `101`, `0`, or `NaN`, because Fetch responses cannot carry them. The call changes neither status nor status text: an earlier helper status, or otherwise the returned or error status, stays in effect, and Start logs a warning outside production. Call `setResponseStatus(undefined, text)` to set only the status text. + +Server-function replies that Start serializes are the exception. Their protected content type describes a body that the client must decode, so reconciliation never applies a helper-selected `204`, `205`, or `304` to them, together with that call's status text. Serialized errors ignore these statuses from error metadata too. Outside production, Start logs a warning, once per request, when it ignores such a status for a serialized reply. Serialized replies are recognized by the protocol requirements Start attaches to the `Response` it creates. Only a wrapper around the same body stream keeps those requirements. A clone, or a response rebuilt around a new body, is an ordinary response, so a bodyless helper status drops its body and its `Location` is not removed. A raw `Response` returned by a server function is not serialized and still follows the rules above. + +If a middleware sets one of these statuses after a streamed SSR response is produced, the middleware executor treats that as response replacement and disposes the original SSR stream owner. + +## Stream Ownership + +SSR streaming responses carry cleanup ownership metadata. Middleware reconciliation preserves or disposes that ownership based on the final body: + +- Same response: ownership is preserved. +- Wrapper response with the same body: ownership moves to the wrapper, and the wrapper keeps the protected transport headers of the body it wraps. Start recognizes such a wrapper by the identity of its body stream. A wrapper around a reply without a body has no stream to compare and is an ordinary replacement response without protocol protection. +- Response with a different body while the original body is being read: ownership moves to the new response, without protected transport headers. A pipe, `tee()`, or a `Response` constructor that copies a body by reading it locks the original body. This includes Bun, which gives a same-body wrapper a new stream object, and libraries that wrap the global `Response`. Start cannot tell such a reader from one that stops early, so a stream whose reader stops early ends with the request's abort or the SSR stream's lifetime limit. +- Different response while nothing reads the original body, or dropped body: original stream owner is disposed. +- Middleware error after `next()`: original stream owner is disposed. +- Response assigned to `result.response` and then replaced by a returned response: Start takes over the assigned response before the returned one, so a replacement disposes the assigned body, such as a transform piped from the original. +- Late result from an abandoned `next()`: a middleware can return its own response while its `next()` is still running, for example a timeout built with `Promise.race`. From then on, the result of that `next()` is abandoned, even while outer middleware is still running. It never replaces or cancels the response the middleware returned, and its body is disposed. Helper writes made by the abandoned work still apply, because helper state belongs to the request. + +This prevents cleanup leaks while still allowing middleware to wrap streamed responses without prematurely disposing the stream. + +A same-body wrapper does not copy helper append records: an application wrapper's headers remain a fresh base for helper writes. + +## Error Handling + +`createStartHandler` rethrows the original uncaught value, including primitive values. No error object is used as a key for recovering request state. Concurrent requests can throw the same error or reusable bodyless response without sharing helper state. A response body stream still has a single consumer. + +Built-in server entries use `createServerEntry` to keep the complete entry callback inside its request scope. The wrapper catches an uncaught value in that scope and calls `handleStartError`. A custom catch inside the wrapper can log and rethrow the error, return a custom response, or call `handleStartError(error)` to preserve Start's helper state. + +Server function RPC errors are converted before the top-level server-entry boundary so serialized protocol headers and bodies are preserved. Their body is the same `{ error }` envelope that a failed server-function call sends, so the client rethrows whatever value was thrown, including strings, plain objects, and `undefined`. A value that cannot be serialized is replaced by the serialization error, as for a result that cannot be serialized. A `Response` that request middleware throws during a server-function request is sent with `x-tss-raw: thrown`, and the client rejects the call with it. Throwing the reply that `next()` returned, or a wrapper around its body, re-sends that reply unchanged, because the body keeps the protocol that decodes it. + +Errors thrown inside a server-function handler or its function middleware do not reach these builders: the function returns them in its serialized result, which uses the helper status or `200` like any other result. A thrown non-redirect `Response` is sent raw instead, with its own status unless a helper selected one. Both error builders resolve status the same way. An error response only uses an error status (`400`-`599`). A status set with `setResponseStatus` before the error applies only when it is an error status. A success, redirect, or bodyless status such as `200`, `201`, `302`, or `204` describes the response that the failure replaced, so Start discards it together with its status text and uses the error's own status or `500`. Error metadata such as `error.status` or `error.statusCode` likewise applies only when it is `400` or higher. Start logs the error to the server console unless the error's own metadata marks it as an HTTP error with a status of `400` or higher, even when a helper selected the status. Because a discarded helper status no longer applies, later reconciliation and `getResponseStatus()` report the error status. + +Both error builders adopt HTTP-style metadata from the thrown value, or from `error.cause` when the error has no `headers`. Start builds a new JSON body for an error, so it never copies the framing and connection headers `Content-Length`, `Content-Encoding`, `Transfer-Encoding`, `Trailer`, `Connection`, `Keep-Alive`, `Proxy-Connection`, and `TE` from error metadata. It does not apply them from response helpers either, for example when a handler set the encoding and length of a file before reading it failed. The same holds for every serialized server-function reply, whose body Start also builds. When `error.cause` is a `Response`, such as a failed upstream `fetch` from any fetch implementation, Start uses its status and status text but none of its headers, because they were written for that upstream reply. + +`handleStartError` behavior: + +- Inside an active request scope, it uses that invocation's event for object, response, and primitive throws. +- If the error is a `Response`, it returns that response when no Start event exists. +- Otherwise it returns a generic JSON error response. + +Calling `handleStartError` after a raw handler has escaped its request scope cannot recover that request's state. Wrap the complete entry callback with `createServerEntry` instead. When rewriting or cloning a request, invoke a wrapped entry for that new `Request`, so errors are converted within its child scope. Calling a raw handler with the new request and catching only in the original request's scope cannot recover the child's helper writes. + +A response returned by a custom entry catch is used as-is. It does not automatically inherit helper state; call `handleStartError` when that inheritance is intended. Delegation through wrapped entries with the same request shares helper state, but each wrapped entry still converts uncaught errors. Invoke a raw `createStartHandler` function when an outer custom catch needs the original thrown value. + +## External sessions + +Start has no built-in session API, session cache, encryption engine, or direct h3 dependency. Session policy and persistence belong to the application's chosen library. + +Three integration boundaries are supported: + +- Libraries that read `Cookie` and emit serialized `Set-Cookie`: use `getRequestHeader('cookie')` and `appendResponseHeader('set-cookie', serializedCookie)`. +- Libraries with a cookie adapter, such as iron-session 9: supply `{ read: getCookie, write: setCookie }`. Load inside the request, then await `session.save()` before returning or redirecting. +- Libraries with a Fetch handler: return the library's `fetch(request)` response from a Start server route. Its response cookies participate in normal reconciliation. + +Use `appendResponseHeader` once for each serialized cookie. Preserve separate `Set-Cookie` values with `headers.getSetCookie()` when adapting a headers collection; commas in `Expires` are not cookie separators. `setResponseHeader('set-cookie', ...)` intentionally replaces the cookie collection and is inappropriate for adding an independent session cookie. + +Start does not auto-save session mutations, consume flash values, renew tokens, share multiple independently loaded session objects, or revoke server-side records. Read a session once per request and share that object through request middleware context when needed. Commit changes explicitly before a response is sent. Parallel requests still need the selected store's concurrency policy; request context does not serialize them. + +Removing the old APIs does not migrate existing sealed h3 cookies. Choose a fresh cookie name and require sign-in again, or implement and test an application-specific transition with the old library before removing it. See the authentication guide and the external-session fixture for concrete integrations. + +## Malformed URLs + +The request boundary validates `request.url` before creating its scope. A URL construction `TypeError` becomes `400 Bad Request`. Other errors are rethrown. diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 4587a6d3ec..020747da69 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.38", + "version": "1.169.45", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -27,6 +27,7 @@ "clean": "rimraf ./dist && rimraf ./coverage", "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", "test:unit": "vitest", + "test:perf": "NODE_ENV=production vitest bench --config vitest.bench.config.ts", "test:eslint": "eslint ./src", "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", @@ -38,6 +39,16 @@ "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", "build": "vite build" }, + "nx": { + "targets": { + "test:perf": { + "dependsOn": [ + "^build" + ], + "cache": false + } + } + }, "type": "module", "types": "dist/esm/index.d.ts", "exports": { @@ -103,13 +114,12 @@ "@tanstack/router-core": "workspace:*", "@tanstack/start-client-core": "workspace:*", "@tanstack/start-storage-context": "workspace:*", - "fetchdts": "^0.1.6", - "h3-v2": "npm:h3@2.0.1-rc.20", + "cookie-es": "^3.0.0", + "fetchdts": "^0.2.0", "seroval": "^1.6.7" }, "devDependencies": { "@standard-schema/spec": "^1.0.0", - "cookie-es": "^3.0.0", "vite": "*", "@types/node": ">=20", "@tanstack/vite-config": "catalog:", @@ -117,6 +127,7 @@ "jsdom": "catalog:", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", - "rimraf": "catalog:" + "rimraf": "catalog:", + "iron-session": "9.0.1" } } diff --git a/packages/start-server-core/skills/start-server-core/SKILL.md b/packages/start-server-core/skills/start-server-core/SKILL.md index 95fb028cea..2e37e7b7ff 100644 --- a/packages/start-server-core/skills/start-server-core/SKILL.md +++ b/packages/start-server-core/skills/start-server-core/SKILL.md @@ -3,7 +3,7 @@ name: start-server-core description: >- Server-side runtime for TanStack Start: createStartHandler, request/response utilities (getRequest, setResponseHeader, - setCookie, getCookie, useSession), three-phase request handling, + setCookie, getCookie, appendResponseHeader), three-phase request handling, AsyncLocalStorage context. metadata: type: core @@ -16,7 +16,7 @@ sources: # Start Server Core (`@tanstack/start-server-core`) -Server-side runtime for TanStack Start. Provides the request handler, request/response utilities, cookie management, and session management. All utilities are available anywhere in the call stack during a request via AsyncLocalStorage. +Server-side runtime for TanStack Start. Provides the request handler, request/response utilities, cookie management, and integration primitives for external session libraries. All utilities are available anywhere in the call stack during a request via AsyncLocalStorage. > **CRITICAL**: These utilities are SERVER-ONLY. Import them from `@tanstack/-start/server`, not from the main entry point. They throw if called outside a server request context. > @@ -92,6 +92,7 @@ import { getResponseHeaders, getResponseHeader, getResponseStatus, + appendResponseHeader, removeResponseHeader, clearResponseHeaders, } from '@tanstack/react-start/server' @@ -105,6 +106,14 @@ const serverFn = createServerFn({ method: 'POST' }).handler(async () => { }) ``` +`getResponseHeader` and `getResponseHeaders` are read helpers. Treat the `Headers` returned by `getResponseHeaders()` as a snapshot; mutating it does not change the outgoing response. Use the setter/removal helpers for writes. + +`appendResponseHeader(name, value)` appends without replacing existing values. For `set-cookie` it accepts fully serialized cookie strings and merges them by cookie identity (name + domain + path; a value `cookie-es` cannot parse is identified by its exact string) — the primitive for bridging external session/auth libraries: + +```ts +appendResponseHeader('set-cookie', await externalSessionLib.commit()) +``` + ## Cookie Management ```ts @@ -133,152 +142,62 @@ const serverFn = createServerFn({ method: 'POST' }).handler(async () => { }) ``` -## Session Management +## External Session Libraries -Encrypted sessions stored in cookies. Requires a password for encryption. +Start has no built-in session API. Use an external library and connect it to the active request using the cookie helpers, serialized headers, or a Fetch handler. + +For a cookie adapter, iron-session 9 accepts Start's cookie functions directly: ```ts -// Use @tanstack/-start for your framework (react, solid, vue) -import { createServerFn } from '@tanstack/react-start' -import { - useSession, - getSession, - updateSession, - clearSession, -} from '@tanstack/react-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' -type SessionData = { - userId?: string -} - -function getSessionConfig() { +// This is an application helper, not a Start export. +export function getAppSession() { const password = process.env.SESSION_SECRET if (!password || password.length < 32) { throw new Error('SESSION_SECRET must be at least 32 characters') } - return { - password, - name: 'my-app-session', - maxAge: 60 * 60 * 24 * 7, - cookie: { - httpOnly: true, - secure: process.env.NODE_ENV === 'production', - sameSite: 'lax' as const, - path: '/', + return getIronSession<{ userId: string }>( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + secure: process.env.NODE_ENV === 'production', + sameSite: 'lax', + path: '/', + }, }, - } + ) } -function getDummyPasswordHash() { - // Precompute this with the same algorithm and cost as real password hashes. - const hash = process.env.DUMMY_PASSWORD_HASH - if (!hash) { - throw new Error('DUMMY_PASSWORD_HASH is required') - } - return hash -} +// After validating credentials in a server function: +const session = await getAppSession() +session.userId = user.id +await session.save() -// Full session manager -const getUser = createServerFn({ method: 'GET' }).handler(async () => { - const session = await useSession(getSessionConfig()) - if (!session.data.userId) { - return null - } - return db.users.findById(session.data.userId) -}) - -// Update session -const login = createServerFn({ method: 'POST' }) - .validator((data: unknown) => { - if ( - typeof data !== 'object' || - data === null || - !('email' in data) || - typeof data.email !== 'string' || - data.email.trim().length === 0 || - !('password' in data) || - typeof data.password !== 'string' || - data.password.length === 0 - ) { - throw new Error('Invalid credentials') - } - return { - email: data.email.trim().toLowerCase(), - password: data.password, - } - }) - .handler(async ({ data }) => { - const user = await db.users.findByEmail(data.email) - const passwordHash = user?.passwordHash ?? getDummyPasswordHash() - const passwordMatches = await verifyPassword(data.password, passwordHash) - if (!user || !passwordMatches) { - throw new Error('Invalid credentials') - } - - await updateSession(getSessionConfig(), { - userId: user.id, - }) - return { success: true } - }) - -// Clear session -const logout = createServerFn({ method: 'POST' }).handler(async () => { - await clearSession(getSessionConfig()) - return { success: true } -}) +// In a logout handler: +const logoutSession = await getAppSession() +logoutSession.destroy() ``` -### Session Config +Use `session.userId`, with an absent-user check, when reading. Keep one session object per operation, or pass it from middleware through request context. The adapter reads the incoming cookie; calling it again does not read pending response cookies. Await writes before returning or redirecting. Do not put a session object or request-derived configuration in module scope. -| Option | Type | Default | Description | -| ---------- | ------------------------ | ----------- | ----------------- | -| `password` | `string` | required | Encryption key | -| `name` | `string` | `'start'` | Cookie name | -| `maxAge` | `number` | `undefined` | Expiry in seconds | -| `cookie` | `false \| CookieOptions` | `undefined` | Cookie settings | +iron-session checks `ttl` when unsealing, and each save renews that lifetime. Choose and test expiration, rotation, and storage behavior explicitly. -### Session Manager Methods - -```ts -const session = await useSession<{ userId: string }>(config) - -session.id // Session ID (string | undefined) -session.data // Session data (typed) -await session.update({ userId: '123' }) // Persist session data -await session.clear() // Clear session data -``` +For libraries that accept a Fetch `Request` and return a `Response`, pass the current request and return the library's response from a server route. For cookie-only transfer, append each value from `response.headers.getSetCookie()` separately; commas can occur inside an `Expires` attribute. Do not use `setResponseHeader('set-cookie', ...)` to append alongside unrelated cookies. ### Production Session Rules -- Keep cookie session data small and non-sensitive. Store a stable session or user ID, then load current permissions and account state from the authoritative store on each protected request. -- Use a server-side session record when you need revocation, device tracking, large data, or immediate role changes. Put only its opaque ID in the cookie. -- Rotate the session after login, privilege changes, password changes, and logout. -- Use `HttpOnly`, `SameSite`, `Path=/`, and `Secure` in production. Use a `__Host-` cookie name in production only when `Secure`, no `Domain`, and `Path=/` are all enforced. -- Use the same cookie name and path when clearing a session. Test login, authenticated refresh, expiry, logout, and a replay of the old cookie. - -## Query Validation - -Validate query string parameters using a Standard Schema: - -```ts -// Use @tanstack/-start for your framework (react, solid, vue) -import { getValidatedQuery } from '@tanstack/react-start/server' -import { z } from 'zod' - -const serverFn = createServerFn({ method: 'GET' }).handler(async () => { - const query = await getValidatedQuery( - z.object({ - page: z.coerce.number().default(1), - limit: z.coerce.number().default(20), - }), - ) - - return { page: query.page } -}) -``` - -> Note: `getValidatedQuery` accepts a Standard Schema validator, not a callback function. +- Keep credentials and session objects in server code; use a new object for each request. +- Load current account permissions from the authoritative store. A client route guard does not authorize a server function. +- Use server-side session records for immediate revocation, device tracking, or large data. Deleting a cookie does not invalidate copies of stateless credentials. +- Use `HttpOnly`, an appropriate `SameSite`, `Path=/`, and `Secure` on HTTPS deployments. Cookie flags complement CSRF protection. +- Test login, authenticated SSR and navigation, persistence before redirects, expiry, logout, and concurrent requests. Start handles request/response plumbing; the application and its session library own session semantics. ## How Request Handling Works @@ -314,9 +233,9 @@ const getAuth = createServerFn({ method: 'GET' }).handler(async () => { }) ``` -### 2. HIGH: Forgetting session password for most session operations +### 2. HIGH: Forgetting to persist an external session -`useSession`, `getSession`, `updateSession`, and `sealSession` all require a `password` field for encryption. Missing it throws at runtime. `clearSession` accepts `Partial`, so password is optional for clearing. +Mutating a session object does not necessarily write a cookie. Follow the library's explicit save or commit API and await it before returning or redirecting. Append serialized `Set-Cookie` values individually, preserving cookies from other middleware. ### 3. MEDIUM: Using session without HTTPS in production @@ -328,6 +247,6 @@ Do not create session config from `process.env` at module load or cache `getRequ ## Cross-References -- [start-core/server-functions](../../../start-client-core/skills/start-core/server-functions/SKILL.md) — creating server functions that use these utilities -- [start-core/middleware](../../../start-client-core/skills/start-core/middleware/SKILL.md) — request middleware -- [start-core/server-routes](../../../start-client-core/skills/start-core/server-routes/SKILL.md) — server route handlers +- `@tanstack/start-client-core#start-core/server-functions` — creating server functions that use these utilities +- `@tanstack/start-client-core#start-core/middleware` — request middleware +- `@tanstack/start-client-core#start-core/server-routes` — server route handlers diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 4c3ba81eca..f1be8fe0d9 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -1,5 +1,7 @@ import { createServerHistory } from '@tanstack/history' import { + X_TSS_RAW_RESPONSE, + X_TSS_SERIALIZED, createCsrfMiddleware, createNullProtoObject, csrfSymbol, @@ -9,7 +11,6 @@ import { } from '@tanstack/start-client-core' import { _getRenderedMatches, - executeRewriteInput, isDangerousProtocol, isPromise, isRedirect, @@ -21,7 +22,6 @@ import { getNormalizedURL, isSsrResponse, normalizeSsrResponse, - replaceSsrResponse, stripSsrResponseBody, waitForRequest, } from '@tanstack/router-core/ssr/server' @@ -29,9 +29,22 @@ import { getStartContext, runWithStartContext, } from '@tanstack/start-storage-context' -import { requestHandler } from './request-response' +import { + createFinalizedResponse, + finalizeResponse, + reconcileResponse, + restoreResponseProtocol, + transferResponseMetadata, + transferResponseProtocol, + withStartRequest, +} from './internal-request-response' import { getStartManifest } from './router-manifest' -import { handleServerAction } from './server-functions-handler' +import { + DeferredResponse, + createServerFnErrorResponse, + handleServerAction, + toThrownServerFnResponse, +} from './server-functions-handler' import { createEarlyHintsCollector } from './early-hints' import { createCachedBaseManifestLoader, @@ -49,7 +62,8 @@ import type { RouterEntry, StartEntry, } from '@tanstack/start-client-core' -import type { RequestHandler } from './request-handler' +import type { RequestHandler, RequestOptions } from './request-handler' +import type { StartEvent } from './internal-request-response' import type { AnyRoute, AnyRouter, @@ -73,16 +87,13 @@ export interface CreateStartHandlerOptions extends FinalManifestOptions { handler: HandlerCallback } -function getStartResponseHeaders(opts: { router: AnyRouter }) { - const headers = mergeHeaders( - { - 'Content-Type': 'text/html; charset=utf-8', - }, - ..._getRenderedMatches(opts.router.stores.matches.get()).map((match) => { - return match.headers - }), - ) - return headers +function getStartResponseHeaders(router: AnyRouter) { + const headers = new Headers({ 'content-type': 'text/html; charset=utf-8' }) + const matches = _getRenderedMatches(router.stores.matches.get()) + // Most matches set no headers; merge only when one does. + return matches.some((match) => match.headers) + ? mergeHeaders(headers, ...matches.map((match) => match.headers)) + : headers } interface PluginAdaptersEntry { @@ -96,9 +107,8 @@ interface Entries { pluginAdapters: PluginAdaptersEntry } -// Cached entries - promises stored immediately to prevent concurrent imports -// that can cause race conditions during module initialization -let entriesPromise: Promise | undefined +// Share initialization, then reuse the loaded entries without a promise wait. +let cachedEntries: Entries | Promise | undefined let hasWarnedMissingCsrfMiddleware = false const defaultCsrfMiddleware = createCsrfMiddleware({ filter: (ctx) => ctx.handlerType === 'serverFn', @@ -132,10 +142,13 @@ async function loadEntries(): Promise { } function getEntries() { - if (!entriesPromise) { - entriesPromise = loadEntries() + if (!cachedEntries) { + cachedEntries = loadEntries().then((entries) => { + cachedEntries = entries + return entries + }) } - return entriesPromise + return cachedEntries } function hasCsrfMiddleware( @@ -224,9 +237,6 @@ interface MiddlewareResponseOwnership { streamResponse?: StreamSsrResponse } -// Entries are released with their response; the map is never cleared by hand. -const responseBodySources = new WeakMap() - function disposeResponseResult(result: TODO, reason: unknown): void { const response = getResponseFromResult(result) if (isSsrResponse(response) || response instanceof Response) { @@ -235,33 +245,19 @@ function disposeResponseResult(result: TODO, reason: unknown): void { } /** - * Marks `response` as directly derived from the current `source`. - * Middleware must consume or cancel any other `clone()` or `tee()` branches. + * A new body continues the owned one when it is the same stream, or when the + * owned body is already being read, as by a pipe, a tee, or a `Response` that + * copies a body by reading it (Bun, or a wrapped global `Response`). Start + * cannot tell such a reader from one that stops early, so it disposes only an + * unread body. A stream whose reader stops early ends with the request's abort + * or the SSR stream's lifetime limit. */ -export function transferResponseBodyOwnership( - source: Response, - response: TResponse, -): TResponse { - if (!source.body || !response.body) { - throw new Error('Response body ownership requires two response bodies') - } - responseBodySources.set(response, source) - return response -} - -function hasResponseBody(value: unknown): value is ResponseWithBody { - return value instanceof Response && value.body !== null -} - function inheritsResponseOwnership( ownership: MiddlewareResponseOwnership, - candidate: unknown, -): candidate is ResponseWithBody { - return ( - hasResponseBody(candidate) && - (candidate.body === ownership.response.body || - responseBodySources.get(candidate) === ownership.response) - ) + body: ResponseBody, +): boolean { + const ownedBody = ownership.response.body + return body === ownedBody || ownedBody.locked } function disposeResponseOwnership( @@ -310,68 +306,118 @@ async function executeMiddleware( terminal: TODO, ctx: PipelineContext, signal: AbortSignal, + event: StartEvent, terminalNext?: TODO, ): Promise { let index = -1 let responseOwnership: MiddlewareResponseOwnership | undefined - // Once the pipeline returned, the HTTP runtime owns the response. A result - // that settles later (for example the loser of a `Promise.race`) must not - // replace or cancel it. - let settled = false + // Invocations form one chain: invocation `d` runs middleware `d` and calls + // next() at most once; the pipeline itself is depth -1. Once an invocation + // returns, a result of next() still pending below it is abandoned: it must + // not replace or cancel the response that invocation chose (for example the + // winner of a `Promise.race`). A caller at depth `d` is therefore abandoned + // when `returnedDepth <= d`, where this is the shallowest returned depth. + let returnedDepth = Infinity const disposeAbandonedResult = createLateResponseDisposer(signal) - const setResponse = (response: TODO) => { - const ssrResponse = isSsrResponse(response) ? response : undefined - const streamResponse = - ssrResponse?.serverSsrCleanup === 'stream' ? ssrResponse : undefined + const adoptResponse = ( + exposed: Response | undefined, + streamResponse?: StreamSsrResponse, + ) => { + const current = responseOwnership + // Read the body once: the getter can allocate a stream for a response + // that has not exposed one yet. + const body = exposed instanceof Response ? exposed.body : null + // `exposed` is a Response with this body whenever `body` is set. + const response = exposed as ResponseWithBody + if (streamResponse && !body && streamResponse !== current?.streamResponse) { + streamResponse.dispose('Response body dropped by Start reconciliation') + } + if (current && current.response === exposed) { + current.streamResponse ??= streamResponse + } else if (current && body && inheritsResponseOwnership(current, body)) { + // A wrapper around the same body stream carries the same encoded bytes, + // so it keeps the transport requirements that decode them. + if (body === current.response.body) { + transferResponseProtocol(current.response, response) + } + current.response = response + current.streamResponse ??= streamResponse + } else { + if (current) { + responseOwnership = undefined + disposeResponseOwnership(current, 'middleware response replaced') + } + responseOwnership = body + ? { response, sourceBody: body, streamResponse } + : undefined + } + ctx.response = exposed + } + + const disposeCurrentBody = (reason: string) => { + const current = responseOwnership + responseOwnership = undefined + if (current) { + disposeResponseOwnership(current, reason) + } + } + + const setResponse = (response: TODO, caller: number) => { + // The owned response is already adopted; only helper state can still + // change it. + const owned = + response !== undefined && response === responseOwnership?.response + const ssrResponse = !owned && isSsrResponse(response) ? response : undefined const exposed: Response | undefined = ssrResponse ? ssrResponse.response : response - const current = responseOwnership - if (settled) { + if (returnedDepth <= caller) { if (exposed !== ctx.response) { disposeResponseResult(response, 'late middleware response') } return } - if (current && current.response === exposed) { - current.streamResponse ??= streamResponse - } else if (current && inheritsResponseOwnership(current, exposed)) { - current.response = exposed - current.streamResponse ??= streamResponse - } else { - if (current) { - disposeResponseOwnership(current, 'middleware response replaced') - } - if (hasResponseBody(exposed)) { - responseOwnership = { - response: exposed, - sourceBody: exposed.body, - streamResponse, - } - } else { - responseOwnership = undefined + if (!owned) { + // Dispose a replaced body before reading helper state: cancellation and + // SSR cleanup callbacks may set headers on the response that replaces it. + adoptResponse( + exposed, + ssrResponse?.serverSsrCleanup === 'stream' ? ssrResponse : undefined, + ) + } + if (exposed instanceof Response) { + const reconciled = reconcileResponse(exposed, event, disposeCurrentBody) + if (reconciled !== exposed) { + adoptRebuilt(exposed, reconciled) } } - ctx.response = exposed } - const reconcileCtxResponse = () => { - if (ctx.response !== responseOwnership?.response) { - setResponse(ctx.response) + // Start rebuilds the owned response around its body, or without a body when + // the response cannot have one. A rebuilt body takes over ownership without + // comparing streams: a wrapped global `Response` copies it into a new one. + const adoptRebuilt = (exposed: Response, rebuilt: Response) => { + const current = responseOwnership + if (current?.response === exposed && rebuilt.body) { + current.response = rebuilt as ResponseWithBody + ctx.response = rebuilt + } else { + adoptResponse(rebuilt) } } let nextPromise: Promise | undefined function next(nextCtx?: TODO): Promise { - const result = runNext(nextCtx) + // Only the deepest started invocation can call next(). + const result = runNext(index, nextCtx) nextPromise = result return result } - async function runNext(nextCtx?: TODO): Promise { + async function runNext(caller: number, nextCtx?: TODO): Promise { signal.throwIfAborted() // Merge context if provided using safeObjectMerge for prototype pollution prevention @@ -379,21 +425,25 @@ async function executeMiddleware( if (nextCtx.context) { ctx.context = safeObjectMerge(ctx.context, nextCtx.context) } - // Copy own properties except context (Object.keys returns only own enumerable properties) - for (const key of Object.keys(nextCtx)) { + // Copy own properties except context (Object.keys returns only own + // enumerable properties). An indexed loop avoids the iterator protocol. + const keys = Object.keys(nextCtx) + // eslint-disable-next-line @typescript-eslint/prefer-for-of + for (let i = 0; i < keys.length; i++) { + const key = keys[i]! if (key === 'response') { - setResponse(nextCtx.response) + setResponse(nextCtx.response, caller) } else if (key !== 'context') { ctx[key] = nextCtx[key] } } } - index++ - const isTerminal = index === middlewares.length + const depth = ++index + const isTerminal = depth === middlewares.length const middleware = - index < middlewares.length - ? middlewares[index] + depth < middlewares.length + ? middlewares[depth] : isTerminal ? terminal : undefined @@ -408,11 +458,8 @@ async function executeMiddleware( // A directly returned next() promise already propagates request aborts. if (nextPromise && pending === nextPromise) { nextPromise = undefined - await pending - if (signal.aborted) { - throw signal.reason - } - return ctx + result = await pending + signal.throwIfAborted() } else if (!isPromise(pending)) { result = pending signal.throwIfAborted() @@ -425,7 +472,15 @@ async function executeMiddleware( ) } } catch (err) { - reconcileCtxResponse() + if (depth < returnedDepth) { + returnedDepth = depth + } + if (returnedDepth > caller) { + // Middleware can replace next()'s shared response before throwing. + // Track that body for cleanup without rebuilding a body it may have + // already locked, consumed, or transferred. + adoptResponse(ctx.response) + } if (signal.aborted) { if (result !== undefined) { disposeAbandonedResult(result) @@ -436,48 +491,92 @@ async function executeMiddleware( throw signal.reason } if (err instanceof Response) { - setResponse(err) + // A thrown Response replies to the request. For a server function + // call, the client rejects the call with it. + setResponse( + ctx.handlerType === 'serverFn' ? toThrownServerFnResponse(err) : err, + caller, + ) return ctx } throw err } + if (depth < returnedDepth) { + returnedDepth = depth + } if (isTerminal && terminalNext && !result) { throwRouteHandlerError() } - reconcileCtxResponse() + if (isTerminal && !terminalNext && result instanceof DeferredResponse) { + if (returnedDepth > caller) { + // Cleanup may write response helpers. Construct only after it has run, + // then publish without rechecking headers that no user has received. + adoptResponse(undefined) + adoptResponse(result.createResponse(event)) + } + return ctx + } + if (result && result !== ctx) { const response = getResponseFromResult(result) - if (response !== undefined && response !== ctx.response) { - setResponse(response) + // Select the replacement before reconciling: middleware may already + // have transferred or piped the previous response's body. + if (response !== undefined) { + // Middleware can assign next()'s shared response and then return + // another one, such as a 304 after transforming the body. Track the + // assigned body first, so the replacement disposes it, without + // rebuilding a body it may have already locked or consumed. + if ( + ctx.response !== responseOwnership?.response && + ctx.response !== response && + returnedDepth > caller + ) { + adoptResponse(ctx.response) + } + setResponse(response, caller) + } else { + setResponse(ctx.response, caller) } if ( + returnedDepth > caller && response !== result && result.context && result.context !== ctx.context ) { ctx.context = safeObjectMerge(ctx.context, result.context) } + } else { + setResponse(ctx.response, caller) } return ctx } try { - await runNext() - const response = ctx.response + await runNext(-1) + let response = ctx.response if (!response) { throwRouteHandlerError() } - reconcileCtxResponse() if (signal.aborted) { throw signal.reason } - settled = true + returnedDepth = -1 + // Middleware can change protocol headers directly on a server-function + // reply, the only response that has them. Restore them once, as the reply + // leaves the pipeline; without middleware only Start has handled it. + if (middlewares.length && ctx.handlerType === 'serverFn') { + const restored = restoreResponseProtocol(response, event) + if (restored !== response) { + adoptRebuilt(response, restored) + response = restored + } + } return responseOwnership ? getOwnedResponse(responseOwnership) : response } catch (err) { - settled = true + returnedDepth = -1 if (responseOwnership) { disposeResponseOwnership( responseOwnership, @@ -540,29 +639,43 @@ export function createStartHandler( }) } - const startRequestResolver: RequestHandler = async ( - request, - requestOpts, - ) => { + const startRequestResolver = async ( + request: Request, + requestOpts: RequestOptions | undefined, + event: StartEvent, + ): Promise => { const signal = request.signal let router: AnyRouter | undefined let routerPromise: Promise | undefined let responseOwnsCleanup = false + let response: Response | undefined try { signal.throwIfAborted() - // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR. - // during normalization paths like '//posts' are flattened to '/posts'. - // in these cases we would prefer to redirect to the new path - const { url, handledProtocolRelativeURL } = getNormalizedURL(request.url) - const href = url.pathname + url.search + url.hash - const origin = url.origin - - if (handledProtocolRelativeURL) { - return Response.redirect(url, 308) + // The Start event already parsed and validated the request URL; reuse + // it instead of re-parsing. The memoized URL must not be mutated. + const requestUrl = event.requestUrl + let url = requestUrl + const pathname = url.pathname + // Plain RPC paths need no routing normalization. Their payload is read + // from the original query; normalize only if they later request a router. + if ( + !SERVER_FN_BASE || + !pathname.startsWith(SERVER_FN_BASE) || + pathname.includes('%') || + pathname.startsWith('//') + ) { + const normalized = getNormalizedURL(requestUrl) + url = normalized.url + if (normalized.handledProtocolRelativeURL) { + return finalizeResponse(Response.redirect(url, 308), event) + } } - const entries = await waitForRequest(getEntries(), signal) + const pendingEntries = getEntries() + const entries = isPromise(pendingEntries) + ? await waitForRequest(pendingEntries, signal) + : pendingEntries const isServerFnRequest = !!SERVER_FN_BASE && url.pathname.startsWith(SERVER_FN_BASE) const startInstance = entries.startEntry.startInstance @@ -596,44 +709,54 @@ export function createStartHandler( serializationAdapters, } - // Flatten request middlewares once - const flattenedRequestMiddlewares = requestStartOptions.requestMiddleware - ? flattenMiddlewares(requestStartOptions.requestMiddleware) - : [] - - // Create set for deduplication - const executedRequestMiddlewares = new Set( - flattenedRequestMiddlewares, - ) + const requestMiddleware = requestStartOptions.requestMiddleware + let executedRequestMiddlewares: Set | undefined + let flattenedRequestMiddlewares: ReturnType = + [] + if (requestMiddleware?.length) { + // Reuse the flattening set for request middleware deduplication. + executedRequestMiddlewares = new Set() + flattenedRequestMiddlewares = flattenMiddlewares( + requestMiddleware, + undefined, + executedRequestMiddlewares, + ) + } // Memoized router getter const getRouter = (): Promise => { routerPromise ??= (async () => { signal.throwIfAborted() - const requestRouter = await waitForRequest( - entries.routerEntry.getRouter(), - signal, - ) + const routerUrl = url === requestUrl ? getNormalizedURL(url).url : url + const pendingRouter = entries.routerEntry.getRouter() + const requestRouter = isPromise(pendingRouter) + ? await waitForRequest(pendingRouter, signal) + : pendingRouter let isShell = IS_SHELL_ENV if (IS_PRERENDERING && !isShell) { isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true' } - const history = createServerHistory(href) + const history = createServerHistory( + routerUrl.pathname + routerUrl.search + routerUrl.hash, + ) requestRouter.update({ history, isShell, isPrerendering: IS_PRERENDERING, - origin: requestRouter.options.origin ?? origin, + origin: requestRouter.options.origin ?? routerUrl.origin, // Start-owned options that RouterConstructorOptions omits. ...{ defaultSsr: requestStartOptions.defaultSsr, - serializationAdapters: [ - ...requestStartOptions.serializationAdapters, - ...(requestRouter.options.serializationAdapters || []), - ], + serializationAdapters: requestRouter.options.serializationAdapters + ?.length + ? [ + ...requestStartOptions.serializationAdapters, + ...requestRouter.options.serializationAdapters, + ] + : requestStartOptions.serializationAdapters, }, basepath: ROUTER_BASEPATH, }) @@ -655,7 +778,9 @@ export function createStartHandler( executedRequestMiddlewares, handlerType, } - let terminal: (ctx: PipelineContext) => unknown + let terminal: ( + ctx: PipelineContext, + ) => Promise if (isServerFnRequest) { if ( @@ -680,14 +805,16 @@ export function createStartHandler( () => handleServerAction({ request, - context: requestOpts?.context, serverFnId, }), ) } else { + // Runs as the route pipeline's terminal, which waits on the request + // signal and disposes a result that settles after an abort. const executeRouter = async ( serverContext: TODO, - matchedRoutes?: ReadonlyArray, + matchedRoutes: ReadonlyArray, + routerInstance: AnyRouter, ): Promise => { if ( !/(^|,)\s*(\*\/\*|text\/html)/.test( @@ -702,35 +829,35 @@ export function createStartHandler( ) } - const manifest = await waitForRequest( - resolveManifestForRequest({ - request, - requestInlineCss: requestOpts?.inlineCss, - getBaseManifest: () => getBaseManifest(matchedRoutes), - }), - signal, - ) - - const earlyHints = createEarlyHintsForRequest({ - onEarlyHints: requestOpts?.onEarlyHints, - responseLinkHeader: requestOpts?.responseLinkHeader, + const pendingManifest = resolveManifestForRequest({ + request, + requestInlineCss: requestOpts?.inlineCss, + getBaseManifest: () => getBaseManifest(matchedRoutes), }) + const manifest = isPromise(pendingManifest) + ? await waitForRequest(pendingManifest, signal) + : pendingManifest + + const earlyHints = createEarlyHintsForRequest(requestOpts) earlyHints?.collectStatic({ manifest, matchedRoutes }) - const routerInstance = await getRouter() - + // The request's stored context, not the resolver's template: RSC + // adds request assets to it, so read them at call time. + const storedStartContext = getStartContext({ throwIfNotFound: false }) attachRouterServerSsrUtils({ router: routerInstance, manifest, - getRequestAssets: () => - getStartContext({ throwIfNotFound: false })?.requestAssets, + getRequestAssets: () => storedStartContext?.requestAssets, }) // `additionalContext` is request-scoped and only read from router.options // during load; avoid a full router.update() and redundant location parse. routerInstance.options.additionalContext = { serverContext } - await routerInstance.load({ _signal: signal }) + await routerInstance.load({ + _signal: signal, + _skipLocationUpdate: true, + }) signal.throwIfAborted() if (routerInstance._serverResult?.type === 'redirect') { @@ -742,30 +869,22 @@ export function createStartHandler( ) // Pass request-scoped assets to dehydrate for manifest injection - const ctx = getStartContext({ throwIfNotFound: false }) await routerInstance.serverSsr!.dehydrate({ - requestAssets: ctx?.requestAssets, + requestAssets: storedStartContext?.requestAssets, signal, }) signal.throwIfAborted() - const responseHeaders = getStartResponseHeaders({ - router: routerInstance, - }) + const responseHeaders = getStartResponseHeaders(routerInstance) earlyHints?.appendResponseHeaders(responseHeaders) signal.throwIfAborted() - const disposeLate = createLateResponseDisposer(signal) - const response = await waitForRequest( - cb({ + return normalizeSsrResponse( + await cb({ request, router: routerInstance, responseHeaders, }), - signal, - disposeLate, - disposeLate, ) - return normalizeSsrResponse(response) } terminal = ({ context }) => @@ -775,36 +894,86 @@ export function createStartHandler( handleServerRoutes({ getRouter, request, - url, executeRouter, context, executedRequestMiddlewares, + signal, + event, }), ) } - const middlewareResponse = await executeMiddleware( - flattenedRequestMiddlewares.map((d) => d.options.server), - terminal, - { - request, - pathname: url.pathname, - handlerType, - context: createNullProtoObject(requestOpts?.context), - }, - signal, - ) + const middlewareCtx: PipelineContext = { + request, + pathname: url.pathname, + handlerType, + context: createNullProtoObject(requestOpts?.context), + } + let middlewareResponse: HandlerCallbackResult + try { + if (!isServerFnRequest && flattenedRequestMiddlewares.length === 0) { + // An empty global pipeline has no additional middleware to run. The + // route pipeline already reconciles responses, owns cleanup, and + // waits on the request signal for every pending result. Only + // server-function terminals can defer JSON construction. + middlewareResponse = await (terminal( + middlewareCtx, + ) as Promise) + } else { + middlewareResponse = await executeMiddleware( + flattenedRequestMiddlewares.map((d) => d.options.server), + terminal, + middlewareCtx, + signal, + event, + ) + } + } catch (error) { + if (signal.aborted) { + throw error + } + if (error instanceof Response) { + middlewareResponse = reconcileResponse(error, event) + } else if (!isServerFnRequest) { + throw error + } else { + // Request middleware can throw before the server function runs. + const disposeLate = createLateResponseDisposer(signal) + middlewareResponse = await waitForRequest( + runWithStartContext( + { + ...startContext, + contextAfterGlobalMiddlewares: middlewareCtx.context, + }, + () => createServerFnErrorResponse(error), + ), + signal, + disposeLate, + disposeLate, + ) + middlewareResponse = reconcileResponse(middlewareResponse, event) + } + } let result: SsrResponse try { - result = await handleRedirectResponse( - middlewareResponse, - getRouter, - signal, - isServerFnRequest && request.headers.get('x-tsr-serverFn') === 'true', - ) - if (request.method === 'HEAD') { + result = normalizeSsrResponse(middlewareResponse) + if (isRedirect(result.response)) { + result = await handleRedirectResponse( + result, + getRouter, + signal, + isServerFnRequest && + request.headers.get('x-tsr-serverFn') === 'true', + event, + ) + } + // Request middleware can read a HEAD body, for example to compute an + // ETag, so it is stripped only when the response leaves the pipeline. + if (request.method === 'HEAD' && result.response.body !== null) { + const source = result.response result = stripSsrResponseBody(result, 'HEAD body stripped') + transferResponseMetadata(source, result.response) } } catch (error) { disposeResponseResult( @@ -816,32 +985,43 @@ export function createStartHandler( bindSsrResponseToRequest(router, result, signal) signal.throwIfAborted() responseOwnsCleanup = result.serverSsrCleanup === 'stream' - return result.response + response = result.response } finally { if (router?.serverSsr && !responseOwnsCleanup) { - // Clean up router SSR state if it was set up but won't be cleaned up by the callback - // (e.g., in redirect cases or early returns before the callback is invoked). - // Transformed streaming response bodies clean up when consumed/cancelled. + // Stream disposal already publishes its cleanup writes at the pipeline + // boundary. Only live eager SSR state can still add response helpers. router.serverSsr.cleanup() + if (response) { + response = finalizeResponse(response, event) + } } // `routerPromise` stays memoized: a streamed Suspense boundary or a late // server function may still ask for this request's router. } + return response } - return requestHandler(startRequestResolver) + return withStartRequest(startRequestResolver) } const relativeRedirectProtocols = new Set() +const SERIALIZED_REDIRECT_HEADERS: ReadonlyMap = new Map( + [ + ['content-type', 'application/json'], + ['location', null], + [X_TSS_RAW_RESPONSE, null], + [X_TSS_SERIALIZED, null], + ], +) async function handleRedirectResponse( - response: HandlerCallbackResult, + ssrResponse: SsrResponse, getRouter: () => Promise, signal: AbortSignal, serializeRedirect: boolean, + event: StartEvent, ): Promise { signal.throwIfAborted() - const ssrResponse = normalizeSsrResponse(response) const redirect = ssrResponse.response if (!isRedirect(redirect)) { return ssrResponse @@ -892,18 +1072,34 @@ async function handleRedirectResponse( if (serializeRedirect) { const redirectOptions = { ...(opts as TODO) } delete redirectOptions.headers + redirectOptions.isSerializedRedirect = true const responseHeaders = new Headers(redirect.headers) responseHeaders.set('content-type', 'application/json') - return replaceSsrResponse( - ssrResponse, - Response.json( - { ...redirectOptions, isSerializedRedirect: true }, - { headers: responseHeaders }, + // The client follows the href in this JSON envelope. An HTTP Location + // would let fetch follow it first if a response helper selected 3xx. + responseHeaders.delete('location') + responseHeaders.delete(X_TSS_RAW_RESPONSE) + responseHeaders.delete(X_TSS_SERIALIZED) + // A caller-supplied toJSON can return undefined despite the library type. + const body = JSON.stringify(redirectOptions) as string | undefined + if (body === undefined) { + throw new TypeError('Value is not JSON serializable') + } + // Both serialization and disposal can write helpers. Construct the envelope + // afterward with its final state instead of reconciling a temporary response. + disposeSsrResponse(ssrResponse, 'redirect response replaced') + return { + response: createFinalizedResponse( + body, + responseHeaders, + SERIALIZED_REDIRECT_HEADERS, + event, ), - 'redirect response replaced', - ) + serverSsrCleanup: 'none', + } } + ssrResponse.response = finalizeResponse(redirect, event) return ssrResponse } @@ -936,27 +1132,29 @@ function withParsedParams( async function handleServerRoutes({ getRouter, request, - url, executeRouter, context, executedRequestMiddlewares, + signal, + event, }: { getRouter: () => Promise request: Request - url: URL executeRouter: ( serverContext: any, - matchedRoutes?: ReadonlyArray, + matchedRoutes: ReadonlyArray, + router: AnyRouter, ) => Promise context: any - executedRequestMiddlewares: Set + executedRequestMiddlewares: Set | undefined + signal: AbortSignal + event: StartEvent }): Promise { const router = await getRouter() - const rewrittenUrl = executeRewriteInput(router.rewrite, url) - const pathname = rewrittenUrl.pathname + const { pathname } = router.latestLocation // this will perform a fuzzy match, however for server routes we need an exact match // if the route is not an exact match, executeRouter will handle rendering the app router - // the match will be cached internally, so no extra work is done during the app router render + // The cached match avoids another route-tree traversal during the app router render. const [matchedRoutes, rawParams, foundRoute] = router.getMatchedRoutes(pathname) @@ -965,7 +1163,7 @@ async function handleServerRoutes({ // Collect and dedupe route middlewares const routeMiddlewares: Array = [] let terminalHandler: TODO = (ctx: TODO) => - executeRouter(ctx.context, matchedRoutes) + executeRouter(ctx.context, matchedRoutes, router) let terminalNext: TODO // Collect middleware from matched routes, filtering out those already executed @@ -977,7 +1175,7 @@ async function handleServerRoutes({ if (serverMiddleware) { const flattened = flattenMiddlewares(serverMiddleware) for (const m of flattened) { - if (!executedRequestMiddlewares.has(m)) { + if (!executedRequestMiddlewares?.has(m)) { routeMiddlewares.push(m.options.server) } } @@ -1034,7 +1232,8 @@ async function handleServerRoutes({ pathname, handlerType: 'router', }, - request.signal, + signal, + event, terminalNext, ) diff --git a/packages/start-server-core/src/early-hints.ts b/packages/start-server-core/src/early-hints.ts index f46cf5f587..4b504d77d5 100644 --- a/packages/start-server-core/src/early-hints.ts +++ b/packages/start-server-core/src/early-hints.ts @@ -191,7 +191,7 @@ export function collectStaticHintsFromManifest( rel: attrs.rel, as: 'script', } - if (attrs.crossOrigin !== undefined) hint.crossOrigin = attrs.crossOrigin + addEarlyHintFetchAttrs(hint, attrs) hints.push(hint) } diff --git a/packages/start-server-core/src/finalManifest.ts b/packages/start-server-core/src/finalManifest.ts index 274e6cb000..f1a9a7044e 100644 --- a/packages/start-server-core/src/finalManifest.ts +++ b/packages/start-server-core/src/finalManifest.ts @@ -3,10 +3,7 @@ import { resolveTransformAssetsConfig, transformManifestAssets, } from './transformAssetUrls' -import { - getStaticHandlerInlineCssDefault, - resolveInlineCssForRequest, -} from './inlineCss' +import { getStaticInlineCss, resolveInlineCssForRequest } from './inlineCss' import type { ServerManifest } from '@tanstack/router-core' import type { HandlerInlineCssOption } from './inlineCss' import type { @@ -40,7 +37,12 @@ export interface FinalManifestOptions { } type FinalManifestCacheKey = 'inline-css' | 'linked-css' -type FinalManifestCache = Map> +// An entry holds the pending manifest, then the manifest itself once it +// resolves, so later requests read it without waiting. +type FinalManifestCache = Map< + FinalManifestCacheKey, + ServerManifest | Promise +> export type GetBaseManifest = () => Promise export interface FinalManifestRequestOptions { @@ -62,7 +64,9 @@ export interface FinalManifestResolver { warmup: (opts: { getBaseManifest: GetBaseManifest }) => Promise | undefined - resolveCached: (opts: FinalManifestRequestOptions) => Promise + resolveCached: ( + opts: FinalManifestRequestOptions, + ) => ServerManifest | Promise resolveUncached: ( opts: FinalManifestRequestOptions, ) => Promise @@ -143,9 +147,7 @@ export function createFinalManifestResolver( opts.transformAssets, { cacheCreateTransform: opts.cacheCreateTransform }, ) - const handlerDefaultInlineCss = getStaticHandlerInlineCssDefault( - opts.inlineCss, - ) + const handlerDefaultInlineCss = getStaticInlineCss(undefined, opts.inlineCss) const getRequestManifestOptions = async ( requestOpts: FinalManifestRequestOptions, @@ -190,8 +192,24 @@ export function createFinalManifestResolver( transformResolver.getTransformFn({ warmup: true }), onError: transformResolver.clearCachedCreateTransform, }), - resolveCached: (requestOpts) => - resolveRequest(requestOpts, finalManifestCache), + resolveCached: (requestOpts) => { + // With a cached transform, the entry for the request's inline-CSS choice + // is the manifest resolveRequest would produce, unless a handler + // callback still has to make that choice. + const inlineCss = getStaticInlineCss( + requestOpts.requestInlineCss, + opts.inlineCss, + ) + if (transformResolver.cache && inlineCss !== undefined) { + const cached = finalManifestCache.get( + getFinalManifestCacheKey(inlineCss), + ) + if (cached) { + return cached + } + } + return resolveRequest(requestOpts, finalManifestCache) + }, resolveUncached: (requestOpts) => resolveRequest(requestOpts, undefined), } } @@ -201,35 +219,41 @@ function getFinalManifestCacheKey(inlineCss: boolean): FinalManifestCacheKey { } function cacheFinalManifestPromise( - cachedFinalManifestPromises: FinalManifestCache, + finalManifestCache: FinalManifestCache, cacheKey: FinalManifestCacheKey, promise: Promise, ): Promise { - const cachedFinalManifestPromise = promise.catch((error) => { - if ( - cachedFinalManifestPromises.get(cacheKey) === cachedFinalManifestPromise - ) { - cachedFinalManifestPromises.delete(cacheKey) - } - throw error - }) + const cachedPromise = promise.then( + (manifest) => { + if (finalManifestCache.get(cacheKey) === cachedPromise) { + finalManifestCache.set(cacheKey, manifest) + } + return manifest + }, + (error) => { + if (finalManifestCache.get(cacheKey) === cachedPromise) { + finalManifestCache.delete(cacheKey) + } + throw error + }, + ) - cachedFinalManifestPromises.set(cacheKey, cachedFinalManifestPromise) - return cachedFinalManifestPromise + finalManifestCache.set(cacheKey, cachedPromise) + return cachedPromise } -function getOrCreateCachedFinalManifestPromise( - cachedFinalManifestPromises: FinalManifestCache, +function getOrCreateCachedFinalManifest( + finalManifestCache: FinalManifestCache, cacheKey: FinalManifestCacheKey, computeFinalManifest: () => Promise, -): Promise { - const cachedFinalManifestPromise = cachedFinalManifestPromises.get(cacheKey) - if (cachedFinalManifestPromise) { - return cachedFinalManifestPromise +): ServerManifest | Promise { + const cached = finalManifestCache.get(cacheKey) + if (cached) { + return cached } return cacheFinalManifestPromise( - cachedFinalManifestPromises, + finalManifestCache, cacheKey, Promise.resolve().then(computeFinalManifest), ) @@ -263,7 +287,7 @@ async function resolveFinalManifest(opts: { } if (opts.finalManifestCache && (!opts.transformFn || opts.cache)) { - return getOrCreateCachedFinalManifestPromise( + return getOrCreateCachedFinalManifest( opts.finalManifestCache, getFinalManifestCacheKey(opts.inlineCss), computeFinalManifest, @@ -290,11 +314,13 @@ function warmupFinalManifest(opts: { return undefined } + // Warmup runs when the handler is created, before any request fills the + // cache. const inlineCss = opts.handlerDefaultInlineCss - const warmupPromise = getOrCreateCachedFinalManifestPromise( + const warmupPromise = cacheFinalManifestPromise( opts.finalManifestCache, getFinalManifestCacheKey(inlineCss), - async () => { + Promise.resolve().then(async () => { const [base, transformFn] = await Promise.all([ opts.getBaseManifest(), opts.getTransformFn(), @@ -305,7 +331,7 @@ function warmupFinalManifest(opts: { transformFn, inlineCss, }) - }, + }), ) if (opts.onError) { diff --git a/packages/start-server-core/src/headers.ts b/packages/start-server-core/src/headers.ts new file mode 100644 index 0000000000..e336588a32 --- /dev/null +++ b/packages/start-server-core/src/headers.ts @@ -0,0 +1,14 @@ +import { splitSetCookieString } from 'cookie-es' + +type HeadersWithGetSetCookie = Headers & { + getSetCookie?: () => Array +} + +export function getSetCookieValues(headers: Headers): Array { + const headersWithSetCookie = headers as HeadersWithGetSetCookie + if (typeof headersWithSetCookie.getSetCookie === 'function') { + return headersWithSetCookie.getSetCookie() + } + const value = headers.get('set-cookie') + return value ? splitSetCookieString(value) : [] +} diff --git a/packages/start-server-core/src/index.tsx b/packages/start-server-core/src/index.tsx index 92937ff039..00d036b024 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -1,7 +1,4 @@ -export { - createStartHandler, - transferResponseBodyOwnership, -} from './createStartHandler' +export { createStartHandler } from './createStartHandler' export type { CreateStartHandlerOptions } from './createStartHandler' export type { @@ -33,8 +30,6 @@ export { HEADERS } from './constants' export type { RequestHandler, RequestOptions } from './request-handler' -export type { SessionConfig } from './session' - export type { EarlyHint, EarlyHintsEvent, diff --git a/packages/start-server-core/src/inlineCss.ts b/packages/start-server-core/src/inlineCss.ts index 249b7f40c8..6fd7bd7fe2 100644 --- a/packages/start-server-core/src/inlineCss.ts +++ b/packages/start-server-core/src/inlineCss.ts @@ -4,13 +4,21 @@ export type HandlerInlineCssOption = | boolean | ((ctx: { request: Request }) => Awaitable) -export function getStaticHandlerInlineCssDefault( +/** + * The inline-CSS choice that needs no handler callback: a request override + * wins, then a static handler option, then the default. Undefined when a + * handler callback has to decide. + */ +export function getStaticInlineCss( + requestInlineCss: boolean | undefined, handlerInlineCss: HandlerInlineCssOption | undefined, -) { +): boolean | undefined { + if (requestInlineCss !== undefined) { + return requestInlineCss + } if (typeof handlerInlineCss === 'function') { return undefined } - return handlerInlineCss ?? true } @@ -19,13 +27,15 @@ export async function resolveInlineCssForRequest(opts: { handlerInlineCss: HandlerInlineCssOption | undefined requestInlineCss: boolean | undefined }) { - if (opts.requestInlineCss !== undefined) { - return opts.requestInlineCss + const inlineCss = getStaticInlineCss( + opts.requestInlineCss, + opts.handlerInlineCss, + ) + if (inlineCss !== undefined) { + return inlineCss } - - if (typeof opts.handlerInlineCss === 'function') { - return await opts.handlerInlineCss({ request: opts.request }) - } - - return opts.handlerInlineCss ?? true + // Only a handler callback leaves the choice open. + return await ( + opts.handlerInlineCss as Exclude + )({ request: opts.request }) } diff --git a/packages/start-server-core/src/internal-request-response.ts b/packages/start-server-core/src/internal-request-response.ts new file mode 100644 index 0000000000..90128ab29c --- /dev/null +++ b/packages/start-server-core/src/internal-request-response.ts @@ -0,0 +1,1490 @@ +import { AsyncLocalStorage } from 'node:async_hooks' +import { isRedirect } from '@tanstack/router-core' + +import { parseCookie, parseSetCookie, serializeCookie } from 'cookie-es' +import { getSetCookieValues } from './headers' +import type { + RequestHeaderMap, + RequestHeaderName, + ResponseHeaderMap, + ResponseHeaderName, + TypedHeaders, +} from 'fetchdts' + +import type { CookieSerializeOptions } from 'cookie-es' +import type { RequestHandler } from './request-handler' + +export interface StartEvent { + request: Request + /** The parsed request URL. Callers must not mutate it. */ + requestUrl: URL + /** + * Lazily created response state. Stays `undefined` until the first + * response helper write so requests that never use helpers pay nothing. + */ + responseState?: ResponseState + /** The most recently reconciled response, used by response read helpers. */ + currentResponse?: Response + /** Applied helper operations belong to this invocation, across runtime copies. */ + responseHeaderAppends?: WeakMap> +} + +/** + * Event-owned mutable response state, recorded by the response helpers. + * + * A plain `Headers` object cannot distinguish between "not set" and + * "explicitly removed", so removals and Set-Cookie intent are tracked + * alongside the headers. All mutations flow through the helper functions in + * this module (`setResponseHeader`, `setCookie`, ...), which record that + * intent directly. + */ +interface ResponseState { + status?: number + statusText?: string + headers: Headers + removedHeaders?: Set + clearHeaders: boolean + setCookieBehavior?: 'merge' | 'replace' + headerAppends?: Map + /** Outside production: a discarded bodyless status was already reported. */ + bodylessStatusWarned?: boolean + /** Identity of each Set-Cookie string seen by this request's merges. */ + setCookieKeys?: Map +} + +interface HeaderAppendOperation { + value: string + previous?: HeaderAppendOperation +} + +// Use a global symbol to ensure the same AsyncLocalStorage instance is shared +// across different bundles that may each bundle this module. +const GLOBAL_EVENT_STORAGE_KEY = Symbol.for('tanstack-start:event-storage') + +const globalObj = globalThis as typeof globalThis & { + [GLOBAL_EVENT_STORAGE_KEY]?: AsyncLocalStorage +} + +if (!globalObj[GLOBAL_EVENT_STORAGE_KEY]) { + globalObj[GLOBAL_EVENT_STORAGE_KEY] = new AsyncLocalStorage() +} + +const eventStorage = globalObj[GLOBAL_EVENT_STORAGE_KEY] + +export type { ResponseHeaderName, RequestHeaderName } + +/** A detached view of outgoing headers. Use the response helpers for writes. */ +export type ReadonlyResponseHeaders = Omit< + TypedHeaders, + 'append' | 'delete' | 'set' | 'forEach' +> & { + forEach: ( + callback: ( + value: string, + name: ResponseHeaderName, + headers: ReadonlyResponseHeaders, + ) => void, + thisArg?: unknown, + ) => void +} + +// Lowercase protocol header names mapped to a required value, or to null when +// the header must be absent. Set-Cookie is never protected: it has one value +// per cookie. +type ProtectedHeaders = ReadonlyMap + +type MaybePromise = T | Promise + +// Protocol requirements describe the response body, so they follow the response +// through delegated requests as well as separately bundled runtime copies. +const PROTECTED_RESPONSE_HEADERS = Symbol.for( + 'tanstack-start:protected-response-headers', +) +type ProtectedResponse = Response & { + [PROTECTED_RESPONSE_HEADERS]?: ProtectedHeaders +} + +function getProtectedResponseHeaders( + response: Response, +): ProtectedHeaders | undefined { + return (response as ProtectedResponse)[PROTECTED_RESPONSE_HEADERS] +} + +function installProtectedResponseHeaders( + response: Response, + headers: ProtectedHeaders, +): void { + Object.defineProperty(response, PROTECTED_RESPONSE_HEADERS, { + value: headers, + configurable: true, + }) +} + +/** Transport requirements belong to the encoded body, not its wrapper. */ +export function transferResponseProtocol( + source: Response, + target: Response, +): void { + const protectedHeaders = getProtectedResponseHeaders(source) + if ( + protectedHeaders && + getProtectedResponseHeaders(target) !== protectedHeaders + ) { + installProtectedResponseHeaders(target, protectedHeaders) + } +} + +/** Preserve metadata when Start reconstructs an existing response. */ +export function transferResponseMetadata( + source: Response, + target: Response, +): void { + transferResponseProtocol(source, target) + const event = eventStorage.getStore() + const appliedHeaderAppends = event?.responseHeaderAppends?.get(source) + if (appliedHeaderAppends) { + event!.responseHeaderAppends!.set(target, appliedHeaderAppends) + } +} + +function normalizeHeaderName(name: string): string { + return name.toLowerCase() +} + +function sanitizeStatusMessage(statusMessage: string): string { + // Strip everything except horizontal tab and printable ASCII (space–'~') + // to prevent header injection through status text. + return statusMessage.replace(/[^\t\x20-\x7e]/g, '') +} + +// The Fetch `Response` constructor only accepts statuses in the 200-599 +// range (anything else throws a RangeError). Start responses are always +// represented as `Response` objects — for server routes and SSR documents +// just like for server functions — so out-of-range statuses (1xx, or exotic +// codes like 783/999) cannot be carried through the pipeline at all. +function sanitizeStatusCode( + statusCode: string | number | undefined, +): number | undefined { + const code = typeof statusCode === 'string' ? Number(statusCode) : statusCode + if ( + code === undefined || + !Number.isInteger(code) || + code < 200 || + code > 599 + ) { + return undefined + } + return code +} + +function getObjectProperty(value: unknown, key: string): unknown { + if ((typeof value === 'object' && value) || typeof value === 'function') { + return (value as Record)[key] + } + return undefined +} + +function getStatusCodeProperty( + value: unknown, + key: 'status' | 'statusCode', +): string | number | undefined { + const property = getObjectProperty(value, key) + if (typeof property === 'string' || typeof property === 'number') { + return property + } + return undefined +} + +function getErrorStatus(error: unknown): number | undefined { + const cause = getObjectProperty(error, 'cause') + return sanitizeStatusCode( + getStatusCodeProperty(error, 'status') ?? + getStatusCodeProperty(error, 'statusCode') ?? + getStatusCodeProperty(cause, 'status') ?? + getStatusCodeProperty(cause, 'statusCode'), + ) +} + +function getErrorStatusText(error: unknown): string | undefined { + const cause = getObjectProperty(error, 'cause') + const statusText = + getObjectProperty(error, 'statusText') ?? + getObjectProperty(error, 'statusMessage') ?? + getObjectProperty(cause, 'statusText') ?? + getObjectProperty(cause, 'statusMessage') + if (typeof statusText === 'string') { + return sanitizeStatusMessage(statusText) + } + return undefined +} + +// Start builds error bodies and serialized replies itself. These headers +// describe another body's framing or its connection, whether they come from +// error metadata or from helpers, so they would corrupt that body on the wire. +const GENERATED_BODY_EXCLUDED_HEADERS: ReadonlySet = new Set([ + 'connection', + 'content-encoding', + 'content-length', + 'keep-alive', + 'proxy-connection', + 'te', + 'trailer', + 'transfer-encoding', +]) + +// Responses from another fetch implementation or realm fail instanceof. +function isResponse(value: unknown): boolean { + return ( + value instanceof Response || + Object.prototype.toString.call(value) === '[object Response]' + ) +} + +export function getErrorHeaders(error: unknown): Headers | undefined { + let init = getObjectProperty(error, 'headers') + if (!init) { + const cause = getObjectProperty(error, 'cause') + // A Response cause is another server's reply, such as a failed upstream + // fetch. Its headers were written for that reply, not for this client. + if (isResponse(cause)) { + return undefined + } + init = getObjectProperty(cause, 'headers') + } + if (!init) { + return undefined + } + let headers: Headers + try { + headers = new Headers(init as HeadersInit) + } catch { + return undefined + } + for (const name of GENERATED_BODY_EXCLUDED_HEADERS) { + headers.delete(name) + } + return headers +} + +function getResponseState(event: StartEvent): ResponseState { + return (event.responseState ||= { + headers: new Headers(), + clearHeaders: false, + }) +} + +function setHeaderState(event: StartEvent, name: string, value: string): void { + const state = getResponseState(event) + const normalizedName = normalizeHeaderName(name) + state.headers.set(name, value) + state.headerAppends?.delete(normalizedName) + state.removedHeaders?.delete(normalizedName) + if (normalizedName === 'set-cookie') { + state.setCookieBehavior = 'replace' + } +} + +function appendHeaderState( + event: StartEvent, + name: string, + value: string, +): void { + const state = getResponseState(event) + const normalizedName = normalizeHeaderName(name) + const appendToReturnedHeader = + normalizedName !== 'set-cookie' && + !state.clearHeaders && + !state.removedHeaders?.has(normalizedName) && + (!state.headers.has(normalizedName) || + state.headerAppends?.has(normalizedName)) + // Validate and normalize through native Headers before recording intent. + state.headers.append(name, value) + if (appendToReturnedHeader) { + const appends = (state.headerAppends ||= new Map()) + appends.set(normalizedName, { + value, + previous: appends.get(normalizedName), + }) + } + state.removedHeaders?.delete(normalizedName) + if ( + normalizedName === 'set-cookie' && + state.setCookieBehavior !== 'replace' + ) { + state.setCookieBehavior = 'merge' + } +} + +function deleteHeaderState(event: StartEvent, name: string): void { + const state = getResponseState(event) + const normalizedName = normalizeHeaderName(name) + state.headers.delete(name) + state.headerAppends?.delete(normalizedName) + ;(state.removedHeaders ||= new Set()).add(normalizedName) + if (normalizedName === 'set-cookie') { + state.setCookieBehavior = 'replace' + } +} + +function getDistinctCookieKey( + name: string, + options: { domain?: string; path?: string }, + defaultPath = '', +): string { + return [name, options.domain || '', options.path ?? defaultPath].join(';') +} + +function getDistinctCookieKeyFromHeader(cookie: string): string { + const parsed = parseSetCookie(cookie) + // A cookie the parser rejects is identified by its exact string, so merging + // it again replaces it. Header values cannot contain NUL, so this key cannot + // match a parsed name, domain, and path. + return parsed ? getDistinctCookieKey(parsed.name, parsed) : `\0${cookie}` +} + +function replaceSetCookieValues( + headers: Headers, + cookies: Array, +): void { + headers.delete('set-cookie') + for (const cookie of cookies) { + headers.append('set-cookie', cookie) + } +} + +// Every reconcile pass merges the same immutable cookie strings again, so +// parse each string's identity once per request. +function getCookieKey(state: ResponseState, cookie: string): string { + const keys = (state.setCookieKeys ||= new Map()) + let key = keys.get(cookie) + if (key === undefined) { + key = getDistinctCookieKeyFromHeader(cookie) + keys.set(cookie, key) + } + return key +} + +function getMergedSetCookieValues( + state: ResponseState, + currentCookies: Array, + cookiesToMerge: Array, +): Array { + if (currentCookies.length === 0) { + return cookiesToMerge + } + const cookieKeysToMerge = new Set() + for (const cookie of cookiesToMerge) { + cookieKeysToMerge.add(getCookieKey(state, cookie)) + } + return currentCookies + .filter((cookie) => !cookieKeysToMerge.has(getCookieKey(state, cookie))) + .concat(cookiesToMerge) +} + +function mergeStartSetCookieValues( + event: StartEvent, + cookies: Array, +): void { + if (cookies.length === 0) { + return + } + + const state = getResponseState(event) + state.removedHeaders?.delete('set-cookie') + if (state.setCookieBehavior !== 'replace') { + state.setCookieBehavior = 'merge' + } + replaceSetCookieValues( + state.headers, + getMergedSetCookieValues(state, getSetCookieValues(state.headers), cookies), + ) +} + +function hasProtectedHeaderChanges( + response: Response, + protectedHeaders: ProtectedHeaders, +): boolean { + const headers = response.headers + for (const [name, value] of protectedHeaders) { + if (headers.get(name) !== value) { + return true + } + } + return false +} + +function applyProtectedHeaders( + protectedHeaders: ProtectedHeaders, + headers: Headers, +): void { + for (const [name, value] of protectedHeaders) { + if (value === null) { + headers.delete(name) + } else { + headers.set(name, value) + } + } +} + +function applyHeaderState( + target: Headers, + state: ResponseState, + generatedBody: boolean, + protectedHeaders?: ProtectedHeaders, + appliedHeaderAppends?: Map, +): Headers { + let headers = target + const mutableHeaders = () => { + if (headers === target) { + headers = new Headers(target) + } + return headers + } + + if (state.clearHeaders) { + // Snapshot the keys before deleting: deleting during live Headers + // iteration skips entries. + for (const name of Array.from(target.keys())) { + if (!protectedHeaders?.has(name)) { + mutableHeaders().delete(name) + } + } + } + + if (!state.clearHeaders && state.removedHeaders) { + for (const name of state.removedHeaders) { + if (!protectedHeaders?.has(name) && headers.has(name)) { + mutableHeaders().delete(name) + } + } + } + + // Headers iteration combines repeated header values into one comma-joined + // value, so `set` carries multi-value headers (Link, Vary, ...) losslessly. + // Set-Cookie is the one header where comma-joining is unsafe (cookie + // attributes like Expires contain commas), so it is handled separately. + for (const [name, value] of state.headers) { + if ( + name !== 'set-cookie' && + !protectedHeaders?.has(name) && + !(generatedBody && GENERATED_BODY_EXCLUDED_HEADERS.has(name)) + ) { + let append = state.headerAppends?.get(name) + if (!append) { + if (headers.get(name) !== value) { + mutableHeaders().set(name, value) + } + continue + } + const applied = appliedHeaderAppends?.get(name) + const pending: Array = [] + while (append && append !== applied) { + pending.push(append.value) + append = append.previous + } + for (let index = pending.length - 1; index >= 0; index--) { + mutableHeaders().append(name, pending[index]!) + } + } + } + + if (state.setCookieBehavior && !protectedHeaders?.has('set-cookie')) { + const eventSetCookies = getSetCookieValues(state.headers) + const currentCookies = getSetCookieValues(headers) + const cookies = + state.setCookieBehavior === 'replace' + ? eventSetCookies + : getMergedSetCookieValues(state, currentCookies, eventSetCookies) + if ( + cookies.length !== currentCookies.length || + cookies.some((cookie, index) => cookie !== currentCookies[index]) + ) { + replaceSetCookieValues(mutableHeaders(), cookies) + } + } + return headers +} + +function canHaveBody(method: string, status: number): boolean { + return method !== 'HEAD' && status !== 204 && status !== 205 && status !== 304 +} + +/** A protected content type marks a Start-serialized body the client decodes. */ +function isSerializedResponse(protectedHeaders: ProtectedHeaders | undefined) { + return typeof protectedHeaders?.get('content-type') === 'string' +} + +/** + * A helper status that forbids a body never applies to a serialized + * server-function reply, because the client must decode it. Only a HEAD request + * drops its body. + */ +function getHelperStatus( + state: ResponseState | undefined, + serialized: boolean, +): number | undefined { + const status = state?.status + if (!serialized || status === undefined || canHaveBody('GET', status)) { + return status + } + if (process.env.NODE_ENV !== 'production' && !state!.bodylessStatusWarned) { + state!.bodylessStatusWarned = true + console.warn( + `setResponseStatus(${status}) does not apply to serialized server function responses, because the client must decode their body. Return a Response from the server function to send a response without a body.`, + ) + } + return undefined +} + +/** Helper status text describes the helper status and is ignored with it. */ +function getHelperStatusText( + state: ResponseState | undefined, + helperStatus: number | undefined, +): string | undefined { + return helperStatus === state?.status ? state?.statusText : undefined +} + +function cancelDroppedBody(response: Response, reason: string): void { + try { + response.body?.cancel(reason).catch(() => {}) + } catch { + // Ignore locked or already-consumed bodies. + } +} + +function createReconciledResponse( + body: Response['body'], + status: number, + statusText: string, + headers: Headers, +): Response { + try { + return new Response(body, { + status, + statusText, + headers, + }) + } catch (cause) { + throw new Error( + 'Unable to reconcile response because its body has already been consumed or locked.', + { cause }, + ) + } +} + +/** Apply helper state to a response that leaves Start. */ +export function finalizeResponse( + response: Response, + event: StartEvent, +): Response { + return applyResponseState(response, event, event.request.method) +} + +/** + * Apply helper state with the body rules of `method`. Request middleware still + * reads a HEAD response's body, so the pipeline applies GET rules and strips a + * HEAD body only when the response leaves it. + */ +function applyResponseState( + response: Response, + event: StartEvent, + method: string, + disposeBody?: (reason: string) => void, +): Response { + const protectedHeaders = getProtectedResponseHeaders(response) + const serialized = isSerializedResponse(protectedHeaders) + let helperStatus = getHelperStatus(event.responseState, serialized) + // Some runtimes, such as Bun, allow a body on a 204, 205, or 304 response, + // so check the response's own status too. Read the body last: the getter + // allocates a stream for responses that have not exposed one yet. + const mustDropBody = + !canHaveBody(method, helperStatus ?? response.status) && + response.body !== null + if (mustDropBody) { + const reason = + method === 'HEAD' + ? 'HEAD body stripped' + : 'Response body dropped by Start reconciliation' + if (disposeBody) { + disposeBody(reason) + } else { + cancelDroppedBody(response, reason) + } + // Cancellation/SSR cleanup can write helpers. Read their final state + // before applying headers or recording appends. + helperStatus = getHelperStatus(event.responseState, serialized) + } + const state = event.responseState + + // Without helper writes, preserve the response. + if (!state && !mustDropBody) { + event.currentResponse = response + return response + } + + const status = helperStatus ?? response.status + const statusText = + getHelperStatusText(state, helperStatus) ?? response.statusText + const statusChanged = status !== response.status + const statusTextChanged = statusText !== response.statusText + // applyHeaderState returns the same headers when helper intent changes + // nothing. + const headers = state + ? applyHeaderState( + response.headers, + state, + serialized, + protectedHeaders, + event.responseHeaderAppends?.get(response), + ) + : response.headers + + const reconciled = + statusChanged || + statusTextChanged || + mustDropBody || + headers !== response.headers + ? createReconciledResponse( + mustDropBody ? null : response.body, + status, + statusText, + headers, + ) + : response + if (protectedHeaders && reconciled !== response) { + installProtectedResponseHeaders(reconciled, protectedHeaders) + } + return publishResponse(reconciled, event) +} + +function publishResponse(response: Response, event: StartEvent): Response { + const headerAppends = event.responseState?.headerAppends + if (headerAppends?.size) { + ;(event.responseHeaderAppends ||= new WeakMap()).set( + response, + new Map(headerAppends), + ) + } + event.currentResponse = response + return response +} + +function getHttpErrorStatus(status: number | undefined): number | undefined { + return status !== undefined && status >= 400 ? status : undefined +} + +/** + * Status for a response built from an uncaught error. Only an error status + * (400-599) from a helper or from error metadata describes the failure, so a + * success or redirect status set before the throw cannot hide it. The error is + * logged unless its own metadata marks it as an HTTP error. Reporting runs + * before helper state is read, so hooks that write helpers are included. + */ +function resolveErrorStatus( + error: unknown, + event: Pick | undefined, +): { status: number; statusText: string } { + const metadataStatus = getErrorStatus(error) + const errorStatus = getHttpErrorStatus(metadataStatus) + if (errorStatus === undefined) { + console.error(error) + } + const state = event?.responseState + const helperStatus = getHttpErrorStatus(state?.status) + const status = helperStatus ?? errorStatus ?? 500 + const statusText = + getHelperStatusText(state, helperStatus) ?? + (status === errorStatus || metadataStatus === undefined + ? getErrorStatusText(error) + : undefined) ?? + '' + if (state && state.status !== helperStatus) { + // The failure replaced the response that status was meant for. Discard it + // so later reconciliation keeps the error status. + state.status = undefined + state.statusText = undefined + } + return { status, statusText } +} + +/** + * Internal: status and status text for a serialized server-function error. + * Logs the error and discards a non-error helper status, like any error + * response Start builds. + */ +export function resolveErrorResponseStatus(error: unknown): { + status: number + statusText: string +} { + return resolveErrorStatus(error, eventStorage.getStore()) +} + +function createErrorResponse(error: unknown, event: StartEvent): Response { + // Error metadata and reporting hooks can call public response helpers. + // Materialize them before taking the state used to build the response. + let headers = getErrorHeaders(error) ?? new Headers() + const { status, statusText } = resolveErrorStatus(error, event) + const state = event.responseState + const body = canHaveBody(event.request.method, status) + ? JSON.stringify({ + status, + statusText, + unhandled: true, + message: 'HTTPError', + }) + : null + if (!headers.has('content-type')) { + headers.set('content-type', 'application/json') + } + + if (state) { + headers = applyHeaderState(headers, state, true) + } + + // Build Start-owned errors with their final headers instead of creating a + // response that reconciliation must immediately reconstruct. A byte body + // keeps Fetch from restoring Content-Type after an explicit helper removal. + return publishResponse( + new Response( + body !== null && !headers.has('content-type') + ? new TextEncoder().encode(body) + : body, + { status, statusText, headers }, + ), + event, + ) +} + +function finalizeError(error: unknown, event: StartEvent): Response { + if (error instanceof Response) { + return finalizeResponse(error, event) + } + return createErrorResponse(error, event) +} + +export function handleStartError(error: unknown): Response { + const event = eventStorage.getStore() + if (event) { + return finalizeError(error, event) + } + if (error instanceof Response) { + return error + } + // Outside a server entry there is no invocation to recover. The thrown + // value is never used as a request identifier. + const request = new Request('http://localhost') + return createErrorResponse(error, { + request, + requestUrl: new URL(request.url), + }) +} + +/** Apply helper state to a response inside the request middleware pipeline. */ +export function reconcileResponse( + response: Response, + event: StartEvent, + disposeBody?: (reason: string) => void, +): Response { + // Without helper writes, only a bodyless status could change the response, + // and the response Start last published already satisfies it. Router + // redirects still need destination resolution (or an RPC envelope), so they + // keep their identity until createStartHandler resolves them; response + // getters can already read the helper overlay on this snapshot. + if ( + (!event.responseState && + (response === event.currentResponse || + canHaveBody('GET', response.status))) || + isRedirect(response) + ) { + event.currentResponse = response + return response + } + return applyResponseState(response, event, 'GET', disposeBody) +} + +/** + * Restore protocol headers that middleware changed directly on the response. + * Start does this once, when the response leaves the request middleware + * pipeline; helper writes never override them. + */ +export function restoreResponseProtocol( + response: Response, + event: StartEvent, +): Response { + const protectedHeaders = getProtectedResponseHeaders(response) + if ( + !protectedHeaders || + !hasProtectedHeaderChanges(response, protectedHeaders) + ) { + return response + } + const headers = new Headers(response.headers) + applyProtectedHeaders(protectedHeaders, headers) + const restored = createReconciledResponse( + response.body, + response.status, + response.statusText, + headers, + ) + transferResponseMetadata(response, restored) + event.currentResponse = restored + return restored +} + +/** + * Build a Start-owned serialized reply with already normalized protocol + * headers. A bodyless helper status never applies to it; only a HEAD request + * drops its body. + */ +export function createFinalizedResponse( + body: string | Uint8Array, + headers: Headers, + protectedHeaders: ProtectedHeaders, + event: StartEvent, +): Response { + const state = event.responseState + let status = 200 + let statusText = '' + if (state) { + const helperStatus = getHelperStatus(state, true) + status = helperStatus ?? 200 + statusText = getHelperStatusText(state, helperStatus) ?? '' + headers = applyHeaderState(headers, state, true, protectedHeaders) + } + const response = new Response( + canHaveBody(event.request.method, status) ? (body as BodyInit) : null, + { status, statusText, headers }, + ) + // A new response has no protection to merge with. + installProtectedResponseHeaders(response, protectedHeaders) + return publishResponse(response, event) +} + +export function protectResponseHeaders( + response: Response, + headers: ProtectedHeaders, +): void { + // Callers supply immutable protocol requirements with lowercase names. + // Share those requirements across responses instead of capturing each one. + const previous = getProtectedResponseHeaders(response) + if (previous === headers) { + return + } + if (previous) { + const merged = new Map(previous) + for (const [name, value] of headers) { + merged.set(name, value) + } + headers = merged + } + installProtectedResponseHeaders(response, headers) +} + +/** + * Set and protect transport headers on a new response. Reuse the body stream + * without cloning or teeing it; callers transfer ownership to the result. + */ +export function setProtectedResponseHeaders( + response: Response, + headers: ProtectedHeaders, +): Response { + let next: Response + try { + // Response copies its initializer's headers; change only that fresh copy. + next = new Response(response.body, response) + applyProtectedHeaders(headers, next.headers) + } catch (cause) { + throw new Error( + 'Unable to set response header because its body has already been consumed or locked.', + { cause }, + ) + } + transferResponseMetadata(response, next) + protectResponseHeaders(next, headers) + return next +} + +function decodePathname(pathname: string): string | undefined { + try { + // Return the value so bundlers preserve the potentially throwing decode. + return decodeURI(pathname) + } catch (error) { + if (error instanceof URIError) { + return undefined + } + throw error + } +} + +/** A Start handler that runs in a request scope and receives its event. */ +type ScopedRequestHandler = ( + request: Request, + requestOpts: any, + event: StartEvent, +) => MaybePromise + +function runInStartRequest( + request: Request, + requestOpts: any, + handler: ScopedRequestHandler, +): MaybePromise { + let requestUrl: URL + try { + requestUrl = new URL(request.url) + } catch (error) { + if (error instanceof TypeError) { + return new Response(null, { status: 400, statusText: 'Bad Request' }) + } + throw error + } + const pathname = requestUrl.pathname + // Validate encoded paths without changing the pathname used for routing. + if (pathname.includes('%') && decodePathname(pathname) === undefined) { + return new Response(null, { status: 400, statusText: 'Bad Request' }) + } + const event: StartEvent = { request, requestUrl } + return eventStorage.run(event, handler, request, requestOpts, event) +} + +/** + * Keep the complete server entry, including custom error handling, inside one + * request scope. A custom returned response is used as-is; call handleStartError + * in a custom catch to preserve Start's response helper state. + */ +export function createServerEntry(entry: { + fetch: RequestHandler +}): { fetch: RequestHandler } { + return { + fetch: withStartRequest(async (request: Request, requestOpts: any) => { + try { + return await entry.fetch(request, requestOpts) + } catch (error) { + return handleStartError(error) + } + }), + } +} + +/** + * Establish request scope; the response pipeline owns reconciliation. A nested + * handler delegating the same request participates in its scope. Independent + * fetch invocations and different requests get a fresh event. + */ +export function withStartRequest(handler: ScopedRequestHandler) { + return (request: Request, requestOpts: any): MaybePromise => { + const event = eventStorage.getStore() + if (event?.request === request) { + return handler(request, requestOpts, event) + } + return runInStartRequest(request, requestOpts, handler) + } +} + +export function getStartEvent() { + const event = eventStorage.getStore() + if (!event) { + throw new Error( + `No StartEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`, + ) + } + return event +} + +/** + * Internal: returns the per-request parsed URL for `request`, memoized on the + * Start event so the framework parses each request URL only once. Falls back + * to parsing when called outside a Start event (e.g. in unit tests) or for a + * foreign request. Callers MUST NOT mutate the returned URL. + */ +export function getParsedRequestUrl(request: Request): URL { + const event = eventStorage.getStore() + if (event && event.request === request) { + return event.requestUrl + } + return new URL(request.url) +} + +export function getRequest(): Request { + return getStartEvent().request +} + +export function getRequestHeaders(): TypedHeaders { + return getStartEvent().request.headers as TypedHeaders +} + +export function getRequestHeader(name: RequestHeaderName): string | undefined { + return getRequestHeaders().get(name) ?? undefined +} + +export function getRequestIP(opts?: { + /** + * Use the X-Forwarded-For HTTP header set by proxies. + * + * Note: Make sure that this header can be trusted (your application running behind a CDN or reverse proxy) before enabling. + */ + xForwardedFor?: boolean +}) { + const request = getRequest() + if (opts?.xForwardedFor) { + const forwardedFor = request.headers.get('x-forwarded-for') + const forwardedIp = forwardedFor?.split(',', 1)[0]?.trim() + if (forwardedIp) { + return forwardedIp + } + } + + return ( + (request as Request & { context?: { clientAddress?: string }; ip?: string }) + .context?.clientAddress || + (request as Request & { ip?: string }).ip || + undefined + ) +} + +/** + * Get the request hostname. + * + * If `xForwardedHost` is `true`, it will use the `x-forwarded-host` header if it exists. + * + * If no host header is found, it uses the request URL's host. + */ +export function getRequestHost(opts?: { xForwardedHost?: boolean }) { + const headers = getRequestHeaders() + if (opts?.xForwardedHost) { + const forwardedHost = headers.get('x-forwarded-host') + const host = forwardedHost?.split(',', 1)[0]?.trim() + if (host) { + return host + } + } + return headers.get('host') || getStartEvent().requestUrl.host || 'localhost' +} + +/** + * Get the full incoming request URL. + * + * If `xForwardedHost` is `true`, it will use the `x-forwarded-host` header if it exists. + * + * If `xForwardedProto` is `false`, it will not use the `x-forwarded-proto` header. + */ +export function getRequestUrl(opts?: { + xForwardedHost?: boolean + xForwardedProto?: boolean +}) { + const event = getStartEvent() + // Clone the memoized URL so callers can mutate the result freely. + const url = new URL(event.requestUrl) + url.protocol = getRequestProtocol(opts) + if (opts?.xForwardedHost) { + const host = getRequestHost(opts) + if (host) { + url.host = host + if (!/:\d+$/.test(host)) { + url.port = '' + } + } + } + return url +} + +/** + * Get the request protocol. + * + * If `x-forwarded-proto` header is set to "https", it will return "https". You can disable this behavior by setting `xForwardedProto` to `false`. + * + * If protocol cannot be determined, it will default to "http". + */ +export function getRequestProtocol(opts?: { + xForwardedProto?: boolean +}): 'http' | 'https' | (string & {}) { + const request = getRequest() + if (opts?.xForwardedProto !== false) { + const forwardedProto = request.headers + .get('x-forwarded-proto') + ?.split(',', 1)[0] + ?.trim() + .toLowerCase() + if (forwardedProto === 'https') { + return 'https' + } + if (forwardedProto === 'http') { + return 'http' + } + } + const url = getStartEvent().requestUrl + return url.protocol.slice(0, -1) as 'http' | 'https' | (string & {}) +} + +export function setResponseHeaders( + headers: TypedHeaders | ReadonlyResponseHeaders, +): void { + if (headers instanceof Headers) { + for (const [name, value] of headers) { + if (name !== 'set-cookie') { + setResponseHeader(name as ResponseHeaderName, value) + } + } + + const cookies = getSetCookieValues(headers) + if (cookies.length > 0) { + setResponseHeader( + 'set-cookie', + cookies.length === 1 ? cookies[0]! : cookies, + ) + } + return + } + + if (!Array.isArray(headers)) { + for (const [name, value] of Object.entries( + headers as unknown as Record>, + )) { + setResponseHeader(name as ResponseHeaderName, value) + } + return + } + + const groupedHeaders = new Map< + string, + { name: ResponseHeaderName; values: Array } + >() + const addHeader = (name: string, value: string) => { + const normalizedName = normalizeHeaderName(name) + let header = groupedHeaders.get(normalizedName) + if (!header) { + header = { name: name as ResponseHeaderName, values: [] } + groupedHeaders.set(normalizedName, header) + } + header.values.push(value) + } + + for (const [name, value] of headers) { + addHeader(name, value) + } + + for (const { name, values } of groupedHeaders.values()) { + setResponseHeader(name, values.length === 1 ? values[0]! : values) + } +} + +let SnapshotHeaders: typeof Headers | undefined + +/** + * Outside production, return the snapshot as a Headers subclass that warns when + * code tries to change the outgoing response through it. Its contents and + * behavior are identical to the production snapshot. + */ +function toResponseHeadersSnapshot(headers: Headers): ReadonlyResponseHeaders { + if (process.env.NODE_ENV === 'production') { + return headers as ReadonlyResponseHeaders + } + SnapshotHeaders ??= class ResponseHeadersSnapshot extends Headers { + override append(name: string, value: string): void { + warnSnapshotMutation('append') + super.append(name, value) + } + override delete(name: string): void { + warnSnapshotMutation('delete') + super.delete(name) + } + override set(name: string, value: string): void { + warnSnapshotMutation('set') + super.set(name, value) + } + } + // The constructor fills entries without calling the overridden methods. + const entries: Array<[string, string]> = [] + for (const [name, value] of headers) { + if (name !== 'set-cookie') { + entries.push([name, value]) + } + } + for (const cookie of getSetCookieValues(headers)) { + entries.push(['set-cookie', cookie]) + } + return new SnapshotHeaders(entries) as ReadonlyResponseHeaders +} + +function warnSnapshotMutation(method: string): void { + console.warn( + `getResponseHeaders().${method}() does not change the response: getResponseHeaders() returns a read-only snapshot. Use setResponseHeader, appendResponseHeader, removeResponseHeader, clearResponseHeaders, or setCookie instead.`, + ) +} + +/** + * Read a detached snapshot of the effective response headers. + * Use response header and cookie helpers to change the outgoing response. + */ +export function getResponseHeaders(): ReadonlyResponseHeaders { + const event = getStartEvent() + const state = event.responseState + const currentResponse = event.currentResponse + if (!currentResponse) { + return toResponseHeadersSnapshot( + state ? new Headers(state.headers) : new Headers(), + ) + } + const protectedHeaders = getProtectedResponseHeaders(currentResponse) + let headers = currentResponse.headers + if (state) { + headers = applyHeaderState( + headers, + state, + isSerializedResponse(protectedHeaders), + protectedHeaders, + event.responseHeaderAppends?.get(currentResponse), + ) + } + // Read helpers always return a detached snapshot, including when applying + // helper intent did not need to copy any headers. + if (headers === currentResponse.headers) { + headers = new Headers(headers) + } + if (protectedHeaders) { + applyProtectedHeaders(protectedHeaders, headers) + } + return toResponseHeadersSnapshot(headers) +} + +export function getResponseHeader( + name: ResponseHeaderName, +): string | undefined { + const event = getStartEvent() + const normalizedName = normalizeHeaderName(name) + if ( + normalizedName === 'set-cookie' || + event.responseState?.headerAppends?.has(normalizedName) + ) { + return getResponseHeaders().get(name) ?? undefined + } + const currentResponse = event.currentResponse + const protectedHeaders = currentResponse + ? getProtectedResponseHeaders(currentResponse) + : undefined + if (protectedHeaders?.has(normalizedName)) { + return protectedHeaders.get(normalizedName) ?? undefined + } + if ( + GENERATED_BODY_EXCLUDED_HEADERS.has(normalizedName) && + isSerializedResponse(protectedHeaders) + ) { + return currentResponse!.headers.get(name) ?? undefined + } + + const state = event.responseState + if (state) { + const stateValue = state.headers.get(name) + if (stateValue !== null) { + return stateValue + } + + if (state.clearHeaders) { + return undefined + } + + if (state.removedHeaders?.has(normalizedName)) { + return undefined + } + } + + return currentResponse?.headers.get(name) ?? undefined +} + +export function setResponseHeader( + name: ResponseHeaderName, + value: string | Array, +): void { + const event = getStartEvent() + if (Array.isArray(value)) { + deleteHeaderState(event, name) + for (const valueItem of value) { + appendHeaderState(event, name, valueItem) + } + } else { + setHeaderState(event, name, value) + } +} + +/** + * Append a response header value without replacing existing values. + * + * Ordinary values are appended once per returned response. Start transfers + * that application state when it reconstructs a response. A new response + * created by application code is fresh input: copying already-reconciled + * headers into it also copies their appended values, and helper appends apply + * again. Mutate the current response or pass its middleware result through + * when preserving an existing response's headers. + * + * For `set-cookie`, values must be fully serialized cookie strings; they are + * merged into the outgoing cookies and deduped by cookie identity + * (name + domain + path), exactly like `setCookie`. A value that cannot be + * parsed is identified by its exact string. This is the primitive to + * use when bridging external session/auth libraries that produce raw + * `Set-Cookie` strings. + * + * ```ts + * appendResponseHeader('set-cookie', await externalLib.commitSession(session)) + * ``` + */ +export function appendResponseHeader( + name: ResponseHeaderName, + value: string | Array, +): void { + const event = getStartEvent() + const values = Array.isArray(value) ? value : [value] + if (normalizeHeaderName(name) === 'set-cookie') { + // Merge one value at a time so a batched call behaves exactly like + // sequential calls (same-identity cookies dedupe, last wins). + for (const valueItem of values) { + // Validate before changing cookie identity or removal intent. External + // libraries supply serialized strings, which can fail native validation. + const headers = new Headers({ 'set-cookie': valueItem }) + mergeStartSetCookieValues(event, getSetCookieValues(headers)) + } + return + } + for (const valueItem of values) { + appendHeaderState(event, name, valueItem) + } +} + +export function removeResponseHeader(name: ResponseHeaderName): void { + deleteHeaderState(getStartEvent(), name) +} + +export function clearResponseHeaders( + headerNames?: Array, +): void { + const event = getStartEvent() + if (headerNames && headerNames.length > 0) { + for (const name of headerNames) { + deleteHeaderState(event, name) + } + return + } + + const state = getResponseState(event) + state.clearHeaders = true + state.headers = new Headers() + state.headerAppends = undefined +} + +export function getResponseStatus(): number { + const event = getStartEvent() + const currentResponse = event.currentResponse + const serialized = + !!currentResponse && + isSerializedResponse(getProtectedResponseHeaders(currentResponse)) + return ( + getHelperStatus(event.responseState, serialized) ?? + currentResponse?.status ?? + 200 + ) +} + +export function setResponseStatus(code?: number, text?: string): void { + const event = getStartEvent() + if (code !== undefined) { + // An unusable code must not replace an earlier, returned, or error status. + // Ignore the whole call, including its status text, which describes it. + const status = sanitizeStatusCode(code) + if (status === undefined) { + if (process.env.NODE_ENV !== 'production') { + console.warn( + `setResponseStatus(${code}) was ignored: Fetch Response status codes must be integers from 200 to 599.`, + ) + } + return + } + getResponseState(event).status = status + } + if (text) { + getResponseState(event).statusText = sanitizeStatusMessage(text) + } +} + +/** + * Parse the request to get HTTP Cookie header string and return an object of all cookie name-value pairs. + * @returns Object of cookie name-value pairs + * ```ts + * const cookies = getCookies() + * ``` + */ +export function getCookies(): Record { + const cookies = parseCookie(getRequestHeaders().get('cookie') || '') + const definedCookies: Record = Object.create(null) + + for (const [name, value] of Object.entries(cookies)) { + if (value !== undefined) { + definedCookies[name] = value + } + } + + return definedCookies +} + +/** + * Get a cookie value by name. + * @param name Name of the cookie to get + * @returns {*} Value of the cookie (String or undefined) + * ```ts + * const authorization = getCookie('Authorization') + * ``` + */ +export function getCookie(name: string): string | undefined { + return getCookies()[name] +} + +/** + * Set a cookie value by name. + * @param name Name of the cookie to set + * @param value Value of the cookie to set + * @param options {CookieSerializeOptions} Options for serializing the cookie + * ```ts + * setCookie('Authorization', '1234567') + * ``` + */ +export function setCookie( + name: string, + value: string, + options?: CookieSerializeOptions, +): void { + const { encode, stringify, ...attrs } = options ?? {} + mergeStartSetCookieValues(getStartEvent(), [ + serializeCookie( + { name, value, path: '/', ...attrs }, + { encode, stringify }, + ), + ]) +} + +/** + * Remove a cookie by name. + * @param name Name of the cookie to delete + * @param serializeOptions {CookieSerializeOptions} Cookie options + * ```ts + * deleteCookie('SessionId') + * ``` + */ +export function deleteCookie( + name: string, + options?: CookieSerializeOptions, +): void { + setCookie(name, '', { + ...options, + maxAge: 0, + }) +} + +/** + * Internal: helper status state for a serialized server-function reply. + * Bodyless statuses never apply to it and are omitted with their status text. + */ +export function getSerializedResponseState(): { + status: number | undefined + statusText: string | undefined +} { + const state = getStartEvent().responseState + const status = getHelperStatus(state, true) + return { status, statusText: getHelperStatusText(state, status) } +} diff --git a/packages/start-server-core/src/request-response.ts b/packages/start-server-core/src/request-response.ts index 2f0456bedf..83c529ff9f 100644 --- a/packages/start-server-core/src/request-response.ts +++ b/packages/start-server-core/src/request-response.ts @@ -1,434 +1,30 @@ -import { AsyncLocalStorage } from 'node:async_hooks' +export { + appendResponseHeader, + clearResponseHeaders, + createServerEntry, + deleteCookie, + getCookie, + getCookies, + getRequest, + getRequestHeader, + getRequestHeaders, + getRequestHost, + getRequestIP, + getRequestProtocol, + getRequestUrl, + getResponseHeader, + getResponseHeaders, + getResponseStatus, + handleStartError, + removeResponseHeader, + setCookie, + setResponseHeader, + setResponseHeaders, + setResponseStatus, +} from './internal-request-response' -import { - H3Event, - clearSession as h3_clearSession, - deleteCookie as h3_deleteCookie, - getRequestHost as h3_getRequestHost, - getRequestIP as h3_getRequestIP, - getRequestProtocol as h3_getRequestProtocol, - getRequestURL as h3_getRequestURL, - getSession as h3_getSession, - getValidatedQuery as h3_getValidatedQuery, - parseCookies as h3_parseCookies, - sanitizeStatusCode as h3_sanitizeStatusCode, - sanitizeStatusMessage as h3_sanitizeStatusMessage, - sealSession as h3_sealSession, - setCookie as h3_setCookie, - toResponse as h3_toResponse, - unsealSession as h3_unsealSession, - updateSession as h3_updateSession, - useSession as h3_useSession, -} from 'h3-v2' -import type { - RequestHeaderMap, +export type { + ReadonlyResponseHeaders, RequestHeaderName, - ResponseHeaderMap, ResponseHeaderName, - TypedHeaders, -} from 'fetchdts' - -import type { CookieSerializeOptions } from 'cookie-es' -import type { - Session, - SessionConfig, - SessionData, - SessionManager, - SessionUpdate, -} from './session' -import type { StandardSchemaV1 } from '@standard-schema/spec' -import type { RequestHandler } from './request-handler' - -interface StartEvent { - h3Event: H3Event -} - -// Use a global symbol to ensure the same AsyncLocalStorage instance is shared -// across different bundles that may each bundle this module. -const GLOBAL_EVENT_STORAGE_KEY = Symbol.for('tanstack-start:event-storage') - -const globalObj = globalThis as typeof globalThis & { - [GLOBAL_EVENT_STORAGE_KEY]?: AsyncLocalStorage -} - -if (!globalObj[GLOBAL_EVENT_STORAGE_KEY]) { - globalObj[GLOBAL_EVENT_STORAGE_KEY] = new AsyncLocalStorage() -} - -const eventStorage = globalObj[GLOBAL_EVENT_STORAGE_KEY] - -export type { ResponseHeaderName, RequestHeaderName } - -type HeadersWithGetSetCookie = Headers & { - getSetCookie?: () => Array -} - -type MaybePromise = T | Promise - -function isPromiseLike(value: MaybePromise): value is Promise { - return typeof (value as Promise).then === 'function' -} - -function getSetCookieValues(headers: Headers): Array { - const headersWithSetCookie = headers as HeadersWithGetSetCookie - if (typeof headersWithSetCookie.getSetCookie === 'function') { - return headersWithSetCookie.getSetCookie() - } - const value = headers.get('set-cookie') - return value ? [value] : [] -} - -function mergeEventResponseHeaders(response: Response, event: H3Event): void { - if (response.ok) { - return - } - - const eventSetCookies = getSetCookieValues(event.res.headers) - if (eventSetCookies.length === 0) { - return - } - - const responseSetCookies = getSetCookieValues(response.headers) - response.headers.delete('set-cookie') - for (const cookie of responseSetCookies) { - response.headers.append('set-cookie', cookie) - } - for (const cookie of eventSetCookies) { - response.headers.append('set-cookie', cookie) - } -} - -function attachResponseHeaders( - value: MaybePromise, - event: H3Event, -): MaybePromise { - if (isPromiseLike(value)) { - return value.then((resolved) => { - if (resolved instanceof Response) { - mergeEventResponseHeaders(resolved, event) - } - return resolved - }) - } - - if (value instanceof Response) { - mergeEventResponseHeaders(value, event) - } - - return value -} - -export function requestHandler( - handler: RequestHandler, -) { - return (request: Request, requestOpts: any): Promise | Response => { - let h3Event: H3Event - try { - h3Event = new H3Event(request) - } catch (error) { - if (error instanceof URIError) { - return new Response(null, { - status: 400, - statusText: 'Bad Request', - }) - } - throw error - } - - const response = eventStorage.run({ h3Event }, () => - handler(request, requestOpts), - ) - return h3_toResponse(attachResponseHeaders(response, h3Event), h3Event) - } -} - -function getH3Event() { - const event = eventStorage.getStore() - if (!event) { - throw new Error( - `No StartEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`, - ) - } - return event.h3Event -} - -export function getRequest(): Request { - const event = getH3Event() - return event.req -} - -export function getRequestHeaders(): TypedHeaders { - return getH3Event().req.headers -} - -export function getRequestHeader(name: RequestHeaderName): string | undefined { - return getRequestHeaders().get(name) || undefined -} - -export function getRequestIP(opts?: { - /** - * Use the X-Forwarded-For HTTP header set by proxies. - * - * Note: Make sure that this header can be trusted (your application running behind a CDN or reverse proxy) before enabling. - */ - xForwardedFor?: boolean -}) { - return h3_getRequestIP(getH3Event(), opts) -} - -/** - * Get the request hostname. - * - * If `xForwardedHost` is `true`, it will use the `x-forwarded-host` header if it exists. - * - * If no host header is found, it will default to "localhost". - */ -export function getRequestHost(opts?: { xForwardedHost?: boolean }) { - return h3_getRequestHost(getH3Event(), opts) -} - -/** - * Get the full incoming request URL. - * - * If `xForwardedHost` is `true`, it will use the `x-forwarded-host` header if it exists. - * - * If `xForwardedProto` is `false`, it will not use the `x-forwarded-proto` header. - */ -export function getRequestUrl(opts?: { - xForwardedHost?: boolean - xForwardedProto?: boolean -}) { - return h3_getRequestURL(getH3Event(), opts) -} - -/** - * Get the request protocol. - * - * If `x-forwarded-proto` header is set to "https", it will return "https". You can disable this behavior by setting `xForwardedProto` to `false`. - * - * If protocol cannot be determined, it will default to "http". - */ -export function getRequestProtocol(opts?: { - xForwardedProto?: boolean -}): 'http' | 'https' | (string & {}) { - return h3_getRequestProtocol(getH3Event(), opts) -} - -export function setResponseHeaders( - headers: TypedHeaders, -): void { - const event = getH3Event() - if (event.res.headers === headers) { - return - } - let previousName = '' - // Headers iteration groups entries by name, including separate Set-Cookie values. - for (const [name, value] of headers) { - event.res.headers[name === previousName ? 'append' : 'set'](name, value) - previousName = name - } -} - -export function getResponseHeaders(): TypedHeaders { - const event = getH3Event() - return event.res.headers -} - -export function getResponseHeader( - name: ResponseHeaderName, -): string | undefined { - const event = getH3Event() - return event.res.headers.get(name) || undefined -} - -export function setResponseHeader( - name: ResponseHeaderName, - value: string | Array, -): void { - const event = getH3Event() - if (Array.isArray(value)) { - event.res.headers.delete(name) - for (const valueItem of value) { - event.res.headers.append(name, valueItem) - } - } else { - event.res.headers.set(name, value) - } -} -export function removeResponseHeader(name: ResponseHeaderName): void { - const event = getH3Event() - event.res.headers.delete(name) -} - -export function clearResponseHeaders( - headerNames?: Array, -): void { - const event = getH3Event() - // If headerNames is provided, clear only those headers - if (headerNames && headerNames.length > 0) { - for (const name of headerNames) { - event.res.headers.delete(name) - } - // Otherwise, clear all headers - } else { - for (const name of event.res.headers.keys()) { - event.res.headers.delete(name) - } - } -} - -export function getResponseStatus(): number { - return getH3Event().res.status || 200 -} - -export function setResponseStatus(code?: number, text?: string): void { - const event = getH3Event() - if (code) { - event.res.status = h3_sanitizeStatusCode(code, event.res.status) - } - if (text) { - event.res.statusText = h3_sanitizeStatusMessage(text) - } -} - -/** - * Parse the request to get HTTP Cookie header string and return an object of all cookie name-value pairs. - * @returns Object of cookie name-value pairs - * ```ts - * const cookies = getCookies() - * ``` - */ -export function getCookies(): Record { - const event = getH3Event() - const cookies = h3_parseCookies(event) - const definedCookies: Record = Object.create(null) - - for (const [name, value] of Object.entries(cookies)) { - if (value !== undefined) { - definedCookies[name] = value - } - } - - return definedCookies -} - -/** - * Get a cookie value by name. - * @param name Name of the cookie to get - * @returns {*} Value of the cookie (String or undefined) - * ```ts - * const authorization = getCookie('Authorization') - * ``` - */ -export function getCookie(name: string): string | undefined { - return getCookies()[name] -} - -/** - * Set a cookie value by name. - * @param name Name of the cookie to set - * @param value Value of the cookie to set - * @param options {CookieSerializeOptions} Options for serializing the cookie - * ```ts - * setCookie('Authorization', '1234567') - * ``` - */ -export function setCookie( - name: string, - value: string, - options?: CookieSerializeOptions, -): void { - const event = getH3Event() - h3_setCookie(event, name, value, options) -} - -/** - * Remove a cookie by name. - * @param name Name of the cookie to delete - * @param serializeOptions {CookieSerializeOptions} Cookie options - * ```ts - * deleteCookie('SessionId') - * ``` - */ -export function deleteCookie( - name: string, - options?: CookieSerializeOptions, -): void { - const event = getH3Event() - h3_deleteCookie(event, name, options) -} - -function getDefaultSessionConfig(config: SessionConfig): SessionConfig { - return { - name: 'start', - ...config, - } -} - -/** - * Create a session manager for the current request. - */ -export function useSession( - config: SessionConfig, -): Promise> { - const event = getH3Event() - return h3_useSession(event, getDefaultSessionConfig(config)) -} -/** - * Get the session for the current request - */ -export function getSession( - config: SessionConfig, -): Promise> { - const event = getH3Event() - return h3_getSession(event, getDefaultSessionConfig(config)) -} - -/** - * Update the session data for the current request. - */ -export function updateSession( - config: SessionConfig, - update?: SessionUpdate, -): Promise> { - const event = getH3Event() - return h3_updateSession(event, getDefaultSessionConfig(config), update) -} - -/** - * Encrypt and sign the session data for the current request. - */ -export function sealSession(config: SessionConfig): Promise { - const event = getH3Event() - return h3_sealSession(event, getDefaultSessionConfig(config)) -} -/** - * Decrypt and verify the session data for the current request. - */ -export function unsealSession( - config: SessionConfig, - sealed: string, -): Promise> { - const event = getH3Event() - return h3_unsealSession(event, getDefaultSessionConfig(config), sealed) -} - -/** - * Clear the session data for the current request. - */ -export function clearSession(config: Partial): Promise { - const event = getH3Event() - return h3_clearSession(event, { name: 'start', ...config }) -} - -export function getResponse() { - const event = getH3Event() - return event.res -} - -// not public API (yet) -export function getValidatedQuery( - schema: StandardSchemaV1, -): Promise> { - return h3_getValidatedQuery(getH3Event(), schema) -} +} from './internal-request-response' diff --git a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts index d127b253d5..0eb4993cac 100644 --- a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts +++ b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts @@ -18,7 +18,18 @@ export const ServerFunctionSerializationAdapter = createSerializationAdapter({ // to another server function), it originates from the client and must be // validated the same way as direct HTTP calls to server functions. const serverFn = await getServerFnById(functionId, { origin: 'client' }) - const result = await serverFn(opts ?? {}, signal) + const result = await serverFn( + { + data: opts?.data, + context: opts?.context, + method: serverFn.method ?? 'GET', + }, + signal, + ) + // Only a failed call has an `error` key, holding the thrown value. + if ('error' in result) { + throw result.error + } return result.result } return fn as never diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 48922e2ab6..9fdad40281 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -9,14 +9,21 @@ import { X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, getSerovalPlugins, - safeObjectMerge, } from '@tanstack/start-client-core' import { MAX_FRAMED_STREAMS, MAX_FRAME_PAYLOAD_SIZE, } from '@tanstack/start-client-core/client-rpc' import { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval' -import { getResponse } from './request-response' +import { + createFinalizedResponse, + getErrorHeaders, + getParsedRequestUrl, + getSerializedResponseState, + protectResponseHeaders, + resolveErrorResponseStatus, + setProtectedResponseHeaders, +} from './internal-request-response' import { getServerFnById } from './getServerFnById' import { createMultiplexedStream } from './frame-protocol' import type { @@ -25,15 +32,55 @@ import type { MultiplexedStreamRecord, } from './frame-protocol' import type { Plugin as SerovalPlugin } from 'seroval' +import type { StartEvent } from './internal-request-response' -// Cache serovalPlugins at module level to avoid repeated calls -let serovalPlugins: Array> | undefined = undefined +// Serialized replies are decoded by the client from their body. With a +// helper-selected 3xx status, a Location would let fetch follow it first. +const SERIALIZED_JSON_HEADERS: ReadonlyMap = new Map([ + ['content-type', 'application/json'], + [X_TSS_SERIALIZED, 'true'], + [X_TSS_RAW_RESPONSE, null], + ['location', null], +]) +// A shared template the Response constructor copies. Never mutate it. +const SERIALIZED_JSON_HEADER_INIT = new Headers({ + 'content-type': 'application/json', + [X_TSS_SERIALIZED]: 'true', +}) -// Known FormData 'Content-Type' header values - module-level constant -const FORM_DATA_CONTENT_TYPES = [ - 'multipart/form-data', - 'application/x-www-form-urlencoded', -] +/** Completed bytes own no stream until the request pipeline accepts them. */ +export class DeferredResponse { + constructor(private readonly body: Uint8Array) {} + + createResponse(event: StartEvent): Response { + return createFinalizedResponse( + this.body, + SERIALIZED_JSON_HEADER_INIT, + SERIALIZED_JSON_HEADERS, + event, + ) + } +} + +const SERIALIZED_FRAMED_HEADERS: ReadonlyMap = new Map([ + ['content-type', TSS_CONTENT_TYPE_FRAMED_VERSIONED], + [X_TSS_SERIALIZED, 'true'], + [X_TSS_RAW_RESPONSE, null], + ['location', null], +]) +const NOT_FOUND_HEADERS: ReadonlyMap = new Map([ + ['content-type', 'application/json'], + [X_TSS_SERIALIZED, null], + [X_TSS_RAW_RESPONSE, null], + ['location', null], +]) +const RAW_RESPONSE_HEADERS: ReadonlyMap = new Map([ + [X_TSS_RAW_RESPONSE, 'true'], +]) +// A Response the server function threw. The client rethrows it. +const THROWN_RESPONSE_HEADERS: ReadonlyMap = new Map([ + [X_TSS_RAW_RESPONSE, 'thrown'], +]) // Maximum payload size for GET requests (1MB) const MAX_PAYLOAD_SIZE = 1_000_000 @@ -66,18 +113,74 @@ function cancelRawStream(stream: ReadableStream, reason?: unknown) { void stream.cancel(reason).catch(() => {}) } +/** + * Marks a Response thrown during a server-function request so the client + * rejects the call with it. Redirects keep their own protocol. + */ +export function toThrownServerFnResponse(response: Response): Response { + return isRedirect(response) + ? response + : setProtectedResponseHeaders(response, THROWN_RESPONSE_HEADERS) +} + +/** + * Builds the reply for a server-function request that failed outside the + * function, such as in request middleware. Like a failed call, it carries + * only the thrown value under an `error` key, so the client rethrows it. + */ +export async function createServerFnErrorResponse( + error: unknown, + serovalPlugins?: Array>, +) { + if (isNotFound(error)) { + return isNotFoundResponse(error) + } + + // Header getters and reporting hooks can write helpers before the status + // is resolved. Error statuses are always body-bearing, as the client needs. + const headers = getErrorHeaders(error) ?? new Headers() + const { status, statusText } = resolveErrorResponseStatus(error) + headers.set('Content-Type', 'application/json') + headers.set(X_TSS_SERIALIZED, 'true') + headers.delete(X_TSS_RAW_RESPONSE) + headers.delete('location') + + const plugins = + serovalPlugins ?? getSerovalPlugins(routerDefaultSerovalPlugins) + let serializedError: string + try { + serializedError = JSON.stringify( + await toCrossJSONAsync({ error }, { refs: new Map(), plugins }), + ) + } catch (serializationError) { + // Like a result that cannot be serialized, the call rejects with the + // serialization error instead of the value it could not send. + serializedError = JSON.stringify( + await toCrossJSONAsync( + { error: serializationError }, + { refs: new Map(), plugins }, + ), + ) + } + const errorResponse = new Response(serializedError, { + status, + statusText, + headers, + }) + protectResponseHeaders(errorResponse, SERIALIZED_JSON_HEADERS) + return errorResponse +} + +// The action merges the client context with the trusted server context +// (__executeServer), so the client context is passed through unmerged. export const handleServerAction = async ({ request, - context, serverFnId, }: { request: Request - context: any serverFnId: string }) => { const methodUpper = request.method.toUpperCase() - const url = new URL(request.url) - const action = await getServerFnById(serverFnId, { origin: 'client' }) // Early method check: reject mismatched HTTP methods before parsing @@ -94,17 +197,20 @@ export const handleServerAction = async ({ ) } - const isServerFn = request.headers.get('x-tsr-serverFn') === 'true' - // Initialize serovalPlugins lazily (cached at module level) - serovalPlugins ??= getSerovalPlugins(routerDefaultSerovalPlugins) - const contentType = request.headers.get('Content-Type') + const headers = request.headers + const isServerFn = headers.get('x-tsr-serverfn') === 'true' + let serovalPlugins: Array> | undefined + const getRequestSerovalPlugins = () => { + return (serovalPlugins ??= getSerovalPlugins(routerDefaultSerovalPlugins)) + } + const contentType = headers.get('content-type') try { let res: any if ( - FORM_DATA_CONTENT_TYPES.some( - (type) => contentType && contentType.includes(type), - ) + contentType && + (contentType.includes('multipart/form-data') || + contentType.includes('application/x-www-form-urlencoded')) ) { // We don't support GET requests with FormData payloads... that seems impossible if (methodUpper === 'GET') { @@ -120,8 +226,7 @@ export const handleServerAction = async ({ const serializedContext = formData.get(TSS_FORMDATA_CONTEXT) formData.delete(TSS_FORMDATA_CONTEXT) - const params = { - context, + const params: { context?: unknown; data: FormData; method: string } = { data: formData, method: methodUpper, } @@ -129,13 +234,10 @@ export const handleServerAction = async ({ try { const parsedContext = JSON.parse(serializedContext) const deserializedContext = fromJSON(parsedContext, { - plugins: serovalPlugins, + plugins: getRequestSerovalPlugins(), }) if (typeof deserializedContext === 'object' && deserializedContext) { - params.context = safeObjectMerge( - deserializedContext as Record, - context, - ) + params.context = deserializedContext } } catch (e) { // Log warning for debugging but don't expose to client @@ -146,47 +248,56 @@ export const handleServerAction = async ({ } res = await action(params) - } else if (methodUpper === 'GET') { - // Get payload directly from searchParams - const payloadParam = url.searchParams.get('payload') - // Reject oversized payloads to prevent DoS - if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) { - throw new Error('Payload too large') - } - const payload: any = payloadParam - ? fromJSON(JSON.parse(payloadParam), { plugins: serovalPlugins }) - : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - res = await action(payload) } else { - const payload: any = contentType?.includes('application/json') - ? fromJSON(await request.json(), { plugins: serovalPlugins }) - : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - res = await action(payload) + let json: any + if (methodUpper === 'GET') { + // Get payload directly from searchParams + const payloadParam = + getParsedRequestUrl(request).searchParams.get('payload') + // Reject oversized payloads to prevent DoS + if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) { + throw new Error('Payload too large') + } + json = payloadParam ? JSON.parse(payloadParam) : undefined + } else if (contentType?.includes('application/json')) { + json = await request.json() + } + const payload: any = + json === undefined + ? undefined + : fromJSON(json, { plugins: getRequestSerovalPlugins() }) + // Pass only the fields a client sends, so a crafted `error` or + // `result` key cannot decide the outcome of the call. + res = await action({ + data: payload?.data, + context: payload?.context, + method: methodUpper, + }) } - const unwrapped = res.result !== undefined ? res.result : res.error + const failed = 'error' in res + const unwrapped = failed ? res.error : res.result - if (isNotFound(res)) { - res = isNotFoundResponse(res) - } - - if (!isServerFn) { + if ( + !isServerFn && + (unwrapped instanceof Response || + unwrapped === null || + typeof unwrapped !== 'object') + ) { return unwrapped } if (unwrapped instanceof Response) { + if (failed) { + return toThrownServerFnResponse(unwrapped) + } if (isRedirect(unwrapped)) { return unwrapped } - unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true') - return unwrapped + return setProtectedResponseHeaders(unwrapped, RAW_RESPONSE_HEADERS) } - return serializeResult(res, request.signal, serovalPlugins) + return serializeResult(res, request, getRequestSerovalPlugins()) } catch (error: any) { if (error instanceof Response) { return error @@ -197,36 +308,7 @@ export const handleServerAction = async ({ // The client will check for __redirect and __notFound keys, // and if they exist, it will handle them appropriately. - if (isNotFound(error)) { - return isNotFoundResponse(error) - } - - console.error('Server Fn Error!', error) - - const serializedError = JSON.stringify( - await toCrossJSONAsync(error, { - refs: new Map(), - plugins: serovalPlugins, - }), - ) - const response = getResponse() - const headers = { - 'Content-Type': 'application/json', - [X_TSS_SERIALIZED]: 'true', - } - try { - return new Response(serializedError, { - status: response.status ?? 500, - statusText: response.statusText, - headers, - }) - } catch { - return new Response(serializedError, { - status: 500, - statusText: '', - headers, - }) - } + return createServerFnErrorResponse(error, serovalPlugins) } } @@ -237,10 +319,9 @@ export const handleServerAction = async ({ */ function serializeResult( res: unknown, - signal: AbortSignal, + request: Request, plugins: Array>, -): Response { - const alsResponse = getResponse() +): Response | DeferredResponse { const initialRecords: Array = [] let initialBytes = 0 const pendingRawStreams: Array = [] @@ -325,15 +406,7 @@ function serializeResult( } if (done && pendingRawStreams.length === 0 && initialRecords.length === 1) { - // TextEncoder always creates an ArrayBuffer-backed Uint8Array. - return new Response(initialRecords[0]! as BodyInit, { - status: alsResponse.status, - statusText: alsResponse.statusText, - headers: { - 'Content-Type': 'application/json', - [X_TSS_SERIALIZED]: 'true', - }, - }) + return new DeferredResponse(initialRecords[0]!) } if (done && initialRecords.length === 1) { @@ -364,7 +437,7 @@ function serializeResult( } }, }), - { signal }, + { signal: request.signal }, ) } @@ -490,39 +563,54 @@ function serializeResult( }) return createFramedResponse(readable, { - signal: AbortSignal.any([recordAbortController.signal, signal]), + signal: AbortSignal.any([recordAbortController.signal, request.signal]), onCancel: abortRecordStream, }) +} - function createFramedResponse( - records: ReadableStream, - options: MultiplexedStreamOptions, - ) { - const multiplexedStream = createMultiplexedStream(records, options) - try { - return new Response(multiplexedStream, { - status: alsResponse.status, - statusText: alsResponse.statusText, - headers: { - 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, - [X_TSS_SERIALIZED]: 'true', - }, - }) - } catch (error) { - cancelRawStream(multiplexedStream, error) - throw error - } +function createFramedResponse( + records: ReadableStream, + options: MultiplexedStreamOptions, +) { + const multiplexedStream = createMultiplexedStream(records, options) + // Completed JSON reads helper state later, when the pipeline accepts it. + const { status, statusText } = getSerializedResponseState() + try { + const response = new Response(multiplexedStream, { + status, + statusText, + headers: { + 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }) + protectResponseHeaders(response, SERIALIZED_FRAMED_HEADERS) + return response + } catch (error) { + cancelRawStream(multiplexedStream, error) + throw error } } function isNotFoundResponse(error: any) { const { headers, ...rest } = error + let responseHeaders: HeadersInit + if (headers) { + // Snapshot caller headers before serialization can run user callbacks. + const copiedHeaders = new Headers(headers) + copiedHeaders.set('Content-Type', 'application/json') + copiedHeaders.delete(X_TSS_SERIALIZED) + copiedHeaders.delete(X_TSS_RAW_RESPONSE) + copiedHeaders.delete('location') + responseHeaders = copiedHeaders + } else { + responseHeaders = { 'Content-Type': 'application/json' } + } - return new Response(JSON.stringify(rest), { + const response = new Response(JSON.stringify(rest), { status: 404, - headers: { - 'Content-Type': 'application/json', - ...(headers || {}), - }, + headers: responseHeaders, }) + protectResponseHeaders(response, NOT_FOUND_HEADERS) + return response } diff --git a/packages/start-server-core/src/session.ts b/packages/start-server-core/src/session.ts deleted file mode 100644 index 8617cf8ae7..0000000000 --- a/packages/start-server-core/src/session.ts +++ /dev/null @@ -1,75 +0,0 @@ -// TODO discuss do we want to copy this interface into Start we well? -import type { CookieSerializeOptions } from 'cookie-es' - -// TODO discuss do we want to copy this interface into Start as shown below? - -/** Algorithm used for encryption and decryption. */ -type EncryptionAlgorithm = 'aes-128-ctr' | 'aes-256-cbc' -/** Algorithm used for integrity verification. */ -type IntegrityAlgorithm = 'sha256' -/** @internal */ -type _Algorithm = EncryptionAlgorithm | IntegrityAlgorithm -/** - * Options for customizing the key derivation algorithm used to generate encryption and integrity verification keys as well as the algorithms and salt sizes used. - */ -type SealOptions = Readonly<{ - /** Encryption step options. */ - encryption: SealOptionsSub - /** Integrity step options. */ - integrity: SealOptionsSub - /* Sealed object lifetime in milliseconds where 0 means forever. Defaults to 0. */ - ttl: number - /** Number of seconds of permitted clock skew for incoming expirations. Defaults to 60 seconds. */ - timestampSkewSec: number - /** - * Local clock time offset, expressed in number of milliseconds (positive or negative). Defaults to 0. - */ - localtimeOffsetMsec: number -}> -/** `seal()` method options. */ -type SealOptionsSub = Readonly<{ - /** The length of the salt (random buffer used to ensure that two identical objects will generate a different encrypted result). Defaults to 256. */ - saltBits: number - /** The algorithm used. Defaults to 'aes-256-cbc' for encryption and 'sha256' for integrity. */ - algorithm: TAlgorithm - /** The number of iterations used to derive a key from the password. Defaults to 1. */ - iterations: number - /** Minimum password size. Defaults to 32. */ - minPasswordlength: number -}> -/** Password secret string or buffer.*/ - -type SessionDataT = Record -export type SessionData = Partial -export interface Session { - id: string - createdAt: number - data: SessionData -} - -export type SessionUpdate = - | Partial> - | ((oldData: SessionData) => Partial> | undefined) - -export interface SessionManager { - readonly id: string | undefined - readonly data: SessionData - update: (update: SessionUpdate) => Promise> - clear: () => Promise> -} -export interface SessionConfig { - /** Private key used to encrypt session tokens */ - password: string - /** Session expiration time in seconds */ - maxAge?: number - /** default is 'start' */ - name?: string - /** Default is secure, httpOnly, / */ - cookie?: false | CookieSerializeOptions - /** Default is x-start-session / x-{name}-session */ - sessionHeader?: false | string - seal?: SealOptions - crypto?: Crypto - /** Default is Crypto.randomUUID */ - generateId?: () => string -} diff --git a/packages/start-server-core/tests/createCsrfMiddleware.test.ts b/packages/start-server-core/tests/createCsrfMiddleware.test.ts index a46aa444d2..9d5ce5569e 100644 --- a/packages/start-server-core/tests/createCsrfMiddleware.test.ts +++ b/packages/start-server-core/tests/createCsrfMiddleware.test.ts @@ -264,6 +264,110 @@ describe('createCsrfMiddleware', () => { expect(next).toHaveBeenCalledTimes(1) }) + it.each([false, true])( + 'waits for an async filter returning %s before validating', + async (shouldValidate) => { + let resolveFilter!: (result: boolean) => void + const filterResult = new Promise((resolve) => { + resolveFilter = resolve + }) + const matcher = vi.fn(() => false) + const middleware = createCsrfMiddleware({ + filter: () => filterResult, + secFetchSite: matcher, + }) + const ctx = createContext({ + headers: { 'Sec-Fetch-Site': 'same-origin' }, + }) + const pending = runMiddleware(middleware, ctx) + + expect(matcher).not.toHaveBeenCalled() + resolveFilter(shouldValidate) + const { result, next } = await pending + + expect(matcher).toHaveBeenCalledTimes(shouldValidate ? 1 : 0) + expect(next).toHaveBeenCalledTimes(shouldValidate ? 0 : 1) + if (shouldValidate) { + expect((result as Response).status).toBe(403) + } + }, + ) + + it.each([ + ['secFetchSite', 'Sec-Fetch-Site', 'same-origin'], + ['origin', 'Origin', requestOrigin], + ['referer', 'Referer', `${requestOrigin}/path`], + ] as const)( + 'awaits async %s matchers before continuing or rejecting', + async (option, header, value) => { + for (const allowed of [false, true]) { + const matcher = vi.fn(async () => allowed) + const middleware = createCsrfMiddleware({ [option]: matcher }) + const ctx = createContext({ headers: { [header]: value } }) + + const { result, next } = await runMiddleware(middleware, ctx) + + expect(matcher).toHaveBeenCalledOnce() + expect(matcher).toHaveBeenCalledWith( + value, + expect.objectContaining({ request: ctx.request }), + ) + expect(next).toHaveBeenCalledTimes(allowed ? 1 : 0) + if (!allowed) { + expect((result as Response).status).toBe(403) + } + } + }, + ) + + it('matches a Referer origin with an async origin matcher', async () => { + const matcher = vi.fn(async () => true) + const middleware = createCsrfMiddleware({ origin: matcher }) + const ctx = createContext({ + headers: { Referer: `${requestOrigin}/path` }, + }) + + const { next } = await runMiddleware(middleware, ctx) + + expect(matcher).toHaveBeenCalledWith( + requestOrigin, + expect.objectContaining({ request: ctx.request }), + ) + expect(next).toHaveBeenCalledOnce() + }) + + it.each(['filter', 'secFetchSite', 'origin', 'referer', 'failureResponse'])( + 'rejects when a synchronous or async %s callback throws', + async (option) => { + const error = new Error('CSRF callback failed') + const ctx = createContext({ + headers: + option === 'secFetchSite' + ? { 'Sec-Fetch-Site': 'same-origin' } + : option === 'origin' + ? { Origin: requestOrigin } + : option === 'referer' + ? { Referer: `${requestOrigin}/path` } + : {}, + }) + + for (const callback of [ + () => { + throw error + }, + () => Promise.reject(error), + ]) { + const middleware = createCsrfMiddleware({ [option]: callback }) + const next = vi.fn() + // Synchronous callback errors must still become rejected promises. + const result = middleware.options.server!({ ...ctx, next } as any) + + await expect(result).rejects.toBe(error) + expect(next).not.toHaveBeenCalled() + } + }, + ) + it('uses custom failure responses', async () => { const middleware = createCsrfMiddleware({ failureResponse: new Response('CSRF failed', { status: 419 }), @@ -275,6 +379,39 @@ describe('createCsrfMiddleware', () => { expect((result as Response).status).toBe(419) await expect((result as Response).text()).resolves.toBe('CSRF failed') }) + + it('awaits custom failure response callbacks', async () => { + const response = new Response('CSRF failed', { status: 419 }) + const failureResponse = vi.fn(async () => response) + const middleware = createCsrfMiddleware({ failureResponse }) + const ctx = createContext({}) + + const { result, next } = await runMiddleware(middleware, ctx) + + expect(failureResponse).toHaveBeenCalledWith( + expect.objectContaining({ request: ctx.request }), + ) + expect(result).toBe(response) + expect(next).not.toHaveBeenCalled() + }) + + it('clones a configured failure response for every request', async () => { + const failureResponse = new Response('CSRF failed', { status: 419 }) + const middleware = createCsrfMiddleware({ failureResponse }) + + for (let i = 0; i < 2; i++) { + const { result, next } = await runMiddleware( + middleware, + createContext({}), + ) + + expect(result).not.toBe(failureResponse) + expect((result as Response).status).toBe(419) + await expect((result as Response).text()).resolves.toBe('CSRF failed') + expect(next).not.toHaveBeenCalled() + } + expect(failureResponse.bodyUsed).toBe(false) + }) }) function createContextFromRequest( diff --git a/packages/start-server-core/tests/createStartHandler.test.ts b/packages/start-server-core/tests/createStartHandler.test.ts index 8044b6b52f..f2918ed523 100644 --- a/packages/start-server-core/tests/createStartHandler.test.ts +++ b/packages/start-server-core/tests/createStartHandler.test.ts @@ -3,6 +3,7 @@ import { ReadableStream as NodeReadableStream } from 'node:stream/web' import { afterAll, afterEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' +import { splitSetCookieString } from 'cookie-es' import { createMiddleware, getRouterInstance, @@ -13,6 +14,7 @@ import { RouterCore, createNonReactiveMutableStore, createNonReactiveReadonlyStore, + createSerializationAdapter, redirect, } from '@tanstack/router-core' import { @@ -20,15 +22,48 @@ import { createSsrStreamResponse, transformReadableStreamWithRouter, } from '@tanstack/router-core/ssr/server' +import { createStartHandler } from '../src/createStartHandler' import { - createStartHandler, - transferResponseBodyOwnership, -} from '../src/createStartHandler' + appendResponseHeader, + clearResponseHeaders, + createServerEntry, + getCookie, + getCookies, + getRequestHost, + getRequestIP, + getRequestProtocol, + getRequestUrl, + getResponseHeader, + getResponseHeaders, + getResponseStatus, + getStartEvent, + handleStartError, + protectResponseHeaders, + reconcileResponse, + setCookie, + setResponseHeader, + setResponseHeaders, + setResponseStatus, +} from '../src/internal-request-response' import { - getStaticHandlerInlineCssDefault, + getStaticInlineCss, resolveInlineCssForRequest, } from '../src/inlineCss' -import type { AnyRouter } from '@tanstack/router-core' +import type { AnyRoute, AnyRouter } from '@tanstack/router-core' +import type { + HandlersFnOpts, + RouteMethodHandlerFn, +} from '@tanstack/start-client-core' + +type TestRouteHandlerFn = RouteMethodHandlerFn< + {}, + AnyRoute, + '/', + {}, + undefined, + undefined, + TContext +> const startMocks = vi.hoisted(() => { const hadServerFnBase = Object.prototype.hasOwnProperty.call( @@ -42,9 +77,13 @@ const startMocks = vi.hoisted(() => { previousServerFnBase, requestMiddleware: [] as Array, serverFnResult: undefined as undefined | Response | object, - serverFnHandler: undefined as undefined | (() => unknown), + serverFnHandler: undefined as + | undefined + | ((opts: { serverFnId: string }) => unknown), + serverFnCalls: [] as Array<{ context?: unknown }>, router: undefined as undefined | AnyRouter, routerFactory: undefined as undefined | (() => AnyRouter), + serializationAdapters: [] as Array, } }) @@ -52,7 +91,7 @@ vi.mock('#tanstack-start-entry', () => ({ startInstance: { getOptions: () => ({ requestMiddleware: startMocks.requestMiddleware, - serializationAdapters: [], + serializationAdapters: startMocks.serializationAdapters, }), }, })) @@ -61,12 +100,53 @@ vi.mock('#tanstack-router-entry', () => ({ getRouter: () => startMocks.routerFactory?.() ?? startMocks.router, })) -vi.mock('../src/server-functions-handler', () => ({ - handleServerAction: () => - startMocks.serverFnHandler - ? startMocks.serverFnHandler() - : startMocks.serverFnResult, -})) +vi.mock('../src/server-functions-handler', async (importOriginal) => { + const actual = + await importOriginal() + const { getStartContext } = await import('@tanstack/start-storage-context') + return { + ...actual, + createServerFnErrorResponse: () => { + return new Response(JSON.stringify({ message: 'middleware failed' }), { + status: 500, + headers: { + 'content-type': 'application/json', + 'x-tss-serialized': 'true', + }, + }) + }, + handleServerAction: (opts: { serverFnId: string }) => { + // Server functions read the trusted server context from the start + // context, like __executeServer. + startMocks.serverFnCalls.push({ + context: getStartContext().contextAfterGlobalMiddlewares, + }) + return startMocks.serverFnHandler + ? startMocks.serverFnHandler(opts) + : startMocks.serverFnResult + }, + } +}) + +function createTestStartHandler( + options: Parameters[0], +) { + return createServerEntry({ fetch: createStartHandler(options) }).fetch +} + +// Only server-function replies carry protocol headers. +function createProtocolRequest() { + return new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }) +} + +function createResponseHandler(callback: () => Response | Promise) { + startMocks.requestMiddleware = [createMiddleware().server(callback)] + return createStartHandler(() => { + throw new Error('Response middleware should prevent rendering') + }) +} const getStoreConfig = () => ({ createMutableStore: createNonReactiveMutableStore, @@ -158,12 +238,38 @@ function makeCompletingStreamResponse(router: ReturnType) { ) } +function getSetCookieValues(headers: Headers): Array { + const headersWithSetCookie = headers as Headers & { + getSetCookie?: () => Array + } + if (typeof headersWithSetCookie.getSetCookie === 'function') { + return headersWithSetCookie.getSetCookie() + } + const value = headers.get('set-cookie') + if (value) { + return splitSetCookieString(value) + } + return [] +} + +function expectSetCookie( + cookies: Array, + name: string, + value: string, +): void { + expect( + cookies.filter((cookie) => cookie.startsWith(`${name}=${value};`)), + ).toHaveLength(1) +} + afterEach(() => { startMocks.requestMiddleware = [] startMocks.serverFnResult = undefined startMocks.serverFnHandler = undefined + startMocks.serverFnCalls = [] startMocks.router = undefined startMocks.routerFactory = undefined + startMocks.serializationAdapters = [] vi.unstubAllEnvs() }) @@ -175,7 +281,1005 @@ afterAll(() => { } }) +describe('createStartHandler response reconciliation', () => { + it('preserves returned response cookies when getSetCookie is unavailable', async () => { + const handler = createResponseHandler(() => { + setCookie('helper', '1', { path: '/' }) + const headers = new Headers() + headers.append('set-cookie', 'returned-one=1; Path=/') + headers.append('set-cookie', 'returned-two=2; Path=/') + const response = new Response('ok', { headers }) + const responseHeaders = response.headers as unknown as { + getSetCookie?: unknown + } + responseHeaders.getSetCookie = undefined + return response + }) + + const response = await handler(new Request('http://localhost/'), {}) + const cookies = getSetCookieValues(response.headers) + + expectSetCookie(cookies, 'returned-one', '1') + expectSetCookie(cookies, 'returned-two', '2') + expectSetCookie(cookies, 'helper', '1') + }) + + it('does not dedupe absent-path cookies against explicit-path cookies', async () => { + const handler = createResponseHandler(() => { + setCookie('same', 'helper', { path: '/' }) + return new Response('ok', { + headers: { 'set-cookie': 'same=returned' }, + }) + }) + + const response = await handler(new Request('http://localhost/nested'), {}) + const cookies = getSetCookieValues(response.headers) + + expect(cookies.filter((cookie) => cookie.startsWith('same='))).toEqual([ + 'same=returned', + 'same=helper; Path=/', + ]) + }) + + it('restores protected headers after direct response mutation', async () => { + const handler = createResponseHandler(() => { + const response = new Response('ok', { + headers: { + 'content-type': 'application/json', + 'x-tss-serialized': 'true', + }, + }) + protectResponseHeaders( + response, + new Map([ + ['content-type', 'application/json'], + ['x-tss-serialized', 'true'], + ]), + ) + response.headers.set('content-type', 'text/plain') + response.headers.set('x-tss-serialized', 'false') + return response + }) + + const response = await handler(createProtocolRequest(), {}) + + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + }) + + it('merges repeated protected header snapshots', async () => { + const handler = createResponseHandler(() => { + const response = new Response('ok', { + headers: { + 'content-type': 'application/json', + 'x-tss-raw': 'true', + }, + }) + protectResponseHeaders( + response, + new Map([['content-type', 'application/json']]), + ) + protectResponseHeaders(response, new Map([['x-tss-raw', 'true']])) + response.headers.set('content-type', 'text/plain') + response.headers.set('x-tss-raw', 'false') + return response + }) + + const response = await handler(createProtocolRequest(), {}) + + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-raw')).toBe('true') + }) + + it('reads protected header snapshots after direct response mutation', async () => { + let seenHeader: string | undefined + let seenHeadersHeader: string | null | undefined + const handler = createResponseHandler(() => { + const response = new Response('ok', { + headers: { 'x-transport': 'original' }, + }) + protectResponseHeaders(response, new Map([['x-transport', 'original']])) + const reconciled = reconcileResponse(response, getStartEvent()) + reconciled.headers.set('x-transport', 'mutated') + seenHeader = getResponseHeader('x-transport') + seenHeadersHeader = getResponseHeaders().get('x-transport') + return reconciled + }) + + const response = await handler(createProtocolRequest(), {}) + + expect(seenHeader).toBe('original') + expect(seenHeadersHeader).toBe('original') + expect(response.headers.get('x-transport')).toBe('original') + }) + + it('returns getResponseHeaders as a read-only snapshot after reconciliation', async () => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + const response = reconcileResponse( + new Response('ok', { + headers: { + 'x-keep': 'yes', + 'x-remove': 'remove-me', + }, + }), + getStartEvent(), + ) + const headers = getResponseHeaders() as Headers + expect(headers.get('x-remove')).toBe('remove-me') + headers.set('x-added', 'yes') + headers.delete('x-remove') + return response + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.headers.get('x-keep')).toBe('yes') + expect(response.headers.get('x-added')).toBe(null) + expect(response.headers.get('x-remove')).toBe('remove-me') + expect(warnSpy).toHaveBeenCalledTimes(2) + } finally { + warnSpy.mockRestore() + } + }) + + it('preserves empty string response header values', async () => { + let seenHeader: string | undefined + const handler = createResponseHandler(() => { + setResponseHeader('x-empty', '') + seenHeader = getResponseHeader('x-empty') + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(seenHeader).toBe('') + expect(response.headers.get('x-empty')).toBe('') + }) + + it('keeps helper headers set after clearing response headers', async () => { + const handler = createResponseHandler(() => { + clearResponseHeaders() + setResponseHeader('x-after-clear', 'yes') + return new Response('ok', { + headers: { + 'x-returned': 'removed', + }, + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.headers.get('x-returned')).toBe(null) + expect(response.headers.get('x-after-clear')).toBe('yes') + }) + + it('replaces Set-Cookie arrays and keeps later semantic cookie updates', async () => { + const handler = createResponseHandler(() => { + setResponseHeader('set-cookie', ['array=1; Path=/', 'same=first; Path=/']) + setCookie('same', 'second', { path: '/' }) + return new Response('ok', { + headers: { + 'set-cookie': 'returned=1; Path=/', + }, + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + const cookies = getSetCookieValues(response.headers) + + expect(cookies).toEqual(['array=1; Path=/', 'same=second; Path=/']) + }) + + it('appends non-cookie response headers without replacing values', async () => { + const handler = createResponseHandler(() => { + appendResponseHeader('link', '; rel=preload') + appendResponseHeader('link', ['; rel=preload']) + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.headers.get('link')).toBe( + '; rel=preload, ; rel=preload', + ) + }) + + it('merges appended raw Set-Cookie strings by cookie identity', async () => { + const handler = createResponseHandler(() => { + setCookie('helper', '1', { path: '/' }) + appendResponseHeader('set-cookie', 'external=abc; Path=/; HttpOnly') + // Same cookie identity replaces the previous value instead of + // duplicating — across calls and within one batched call. + appendResponseHeader('set-cookie', [ + 'external=def; Path=/; HttpOnly', + 'other=overwritten; Path=/', + 'other=1; Path=/', + ]) + return new Response('ok', { + headers: { 'set-cookie': 'returned=1; Path=/' }, + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + const cookies = getSetCookieValues(response.headers) + + expectSetCookie(cookies, 'returned', '1') + expectSetCookie(cookies, 'helper', '1') + expectSetCookie(cookies, 'external', 'def') + expectSetCookie(cookies, 'other', '1') + expect(cookies.filter((c) => c.startsWith('external='))).toHaveLength(1) + expect(cookies.filter((c) => c.startsWith('other='))).toHaveLength(1) + }) + + it('warns in development when setResponseStatus is out of range', async () => { + vi.stubEnv('NODE_ENV', 'development') + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(999) + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(200) + expect(warnSpy).toHaveBeenCalledTimes(1) + expect(warnSpy.mock.calls[0]![0]).toContain('setResponseStatus(999)') + } finally { + warnSpy.mockRestore() + vi.unstubAllEnvs() + } + }) + + it('returns the same response after repeated clean reconciliation', async () => { + let firstResponse: Response | undefined + let secondResponse: Response | undefined + const handler = createResponseHandler(() => { + const response = new Response('ok') + firstResponse = reconcileResponse(response, getStartEvent()) + secondResponse = reconcileResponse(firstResponse, getStartEvent()) + return secondResponse + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(secondResponse).toBe(firstResponse) + expect(response).toBe(firstResponse) + }) + + it('applies helper mutations after the same response was reconciled', async () => { + let reconciledResponse: Response | undefined + const handler = createResponseHandler(() => { + const response = new Response('ok') + reconciledResponse = reconcileResponse(response, getStartEvent()) + setResponseHeader('x-late-helper', 'true') + return reconciledResponse + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response).not.toBe(reconciledResponse) + expect(response.body).toBe(reconciledResponse?.body) + expect(reconciledResponse?.headers.get('x-late-helper')).toBeNull() + expect(response.headers.get('x-late-helper')).toBe('true') + }) + + it('reapplies helper headers after direct mutation of a reconciled response', async () => { + const handler = createResponseHandler(() => { + setResponseHeader('x-helper', 'true') + const response = reconcileResponse(new Response('ok'), getStartEvent()) + response.headers.delete('x-helper') + return response + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.headers.get('x-helper')).toBe('true') + }) + + it('applies earlier helper state to later replacement responses', async () => { + let firstResponse: Response | undefined + const handler = createResponseHandler(() => { + setResponseHeader('x-helper', 'true') + firstResponse = reconcileResponse(new Response('first'), getStartEvent()) + return new Response('second') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response).not.toBe(firstResponse) + expect(response.headers.get('x-helper')).toBe('true') + await expect(response.text()).resolves.toBe('second') + }) + + it('restores protected headers changed directly on the response as it leaves the pipeline', async () => { + let returned: Response | undefined + const handler = createResponseHandler(() => { + const response = new Response('ok', { + headers: { 'x-transport': 'original' }, + }) + protectResponseHeaders(response, new Map([['x-transport', 'original']])) + response.headers.set('x-transport', 'mutated') + returned = response + return response + }) + + const response = await handler(createProtocolRequest(), {}) + + expect(response).not.toBe(returned) + expect(response.body).toBe(returned?.body) + expect(returned?.headers.get('x-transport')).toBe('mutated') + expect(response.headers.get('x-transport')).toBe('original') + }) + + it('applies helper status to the returned response', async () => { + const handler = createResponseHandler(() => { + setResponseStatus(201, 'Created') + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(201) + expect(response.statusText).toBe('Created') + }) + + it('sanitizes helper statusText writes', async () => { + const handler = createResponseHandler(() => { + setResponseStatus(418, 'Bad\nTeapot') + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(418) + expect(response.statusText).toBe('BadTeapot') + }) + + it('returns 400 for malformed URLs that throw TypeError', async () => { + const handler = createResponseHandler(() => new Response('unused')) + const response = await handler({ url: 'http://%' } as Request, {}) + + expect(response.status).toBe(400) + expect(response.statusText).toBe('Bad Request') + }) + + it('parses request helpers from forwarded headers and cookies', async () => { + const handler = createResponseHandler(() => { + return Response.json({ + host: getRequestHost(), + forwardedHost: getRequestHost({ xForwardedHost: true }), + protocol: getRequestProtocol(), + originalProtocol: getRequestProtocol({ xForwardedProto: false }), + url: getRequestUrl({ xForwardedHost: true }).toString(), + ip: getRequestIP() ?? null, + forwardedIp: getRequestIP({ xForwardedFor: true }), + cookies: getCookies(), + encodedCookie: getCookie('encoded'), + }) + }) + + const response = await handler( + new Request('http://internal.local:3000/path?x=1', { + headers: { + cookie: 'plain=value; encoded=hello%20world', + host: 'origin.example:8080', + 'x-forwarded-for': '203.0.113.10, 10.0.0.1', + 'x-forwarded-host': 'public.example, proxy.example', + 'x-forwarded-proto': 'https, http', + }, + }), + {}, + ) + + await expect(response.json()).resolves.toEqual({ + host: 'origin.example:8080', + forwardedHost: 'public.example', + protocol: 'https', + originalProtocol: 'http', + url: 'https://public.example/path?x=1', + ip: null, + forwardedIp: '203.0.113.10', + cookies: { + plain: 'value', + encoded: 'hello world', + }, + encodedCookie: 'hello world', + }) + }) + + it('preserves HTTP-style error status, statusText, and headers', async () => { + const handler = createResponseHandler(() => { + const error = new Error('handled') as Error & { + status: number + statusText: string + headers: HeadersInit + } + error.status = 418 + error.statusText = 'Teapot' + error.headers = { 'x-error': 'handled' } + throw error + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(418) + expect(response.statusText).toBe('Teapot') + expect(response.headers.get('x-error')).toBe('handled') + expect(response.headers.get('content-type')).toBe('application/json') + }) + + it('converts errors through handleStartError', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + const handler = createResponseHandler(() => { + throw new Error('handled by default') + }) + + try { + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(500) + expect(response.headers.get('content-type')).toBe('application/json') + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }) + + it('preserves HTTP-style error headers from cause', async () => { + const handler = createResponseHandler(() => { + throw new Error('wrapped', { + cause: { + status: 409, + headers: { 'x-error-cause': 'handled' }, + }, + }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(409) + expect(response.headers.get('x-error-cause')).toBe('handled') + }) + + it.each([200, 201, 302])( + 'does not let a helper %s status hide an uncaught error', + async (helperStatus) => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(helperStatus, 'Helper Status') + throw new TypeError('unexpected failure') + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(500) + expect(response.statusText).toBe('') + await expect(response.json()).resolves.toMatchObject({ + status: 500, + unhandled: true, + }) + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }, + ) + + it('logs an error thrown after a helper selects an error status', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(401, 'Unauthorized') + throw new Error('not signed in') + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(401) + expect(response.statusText).toBe('Unauthorized') + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }) + + it('uses 500 when error metadata carries a non-error status', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + throw Object.assign(new Error('moved'), { + status: 302, + statusText: 'Found', + }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(500) + expect(response.statusText).toBe('') + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }) + + it('does not log errors whose metadata carries an HTTP error status', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(201) + throw Object.assign(new Error('conflict'), { statusCode: 409 }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(409) + expect(consoleError).not.toHaveBeenCalled() + } finally { + consoleError.mockRestore() + } + }) + + it('adopts only the status of an upstream Response cause', async () => { + const handler = createResponseHandler(() => { + throw new Error('upstream failed', { + cause: new Response('

upstream

', { + status: 502, + headers: { + 'content-encoding': 'gzip', + 'content-length': '999', + 'content-type': 'text/html', + 'set-cookie': 'upstream=1; Path=/', + 'x-upstream': 'yes', + }, + }), + }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(502) + expect(response.headers.get('x-upstream')).toBeNull() + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('content-encoding')).toBeNull() + expect(response.headers.get('content-length')).toBeNull() + expect(response.headers.getSetCookie()).toEqual([]) + await expect(response.json()).resolves.toMatchObject({ status: 502 }) + }) + + it('adopts no headers from a Response cause of another fetch implementation', async () => { + // npm undici, node-fetch, or another realm: not an instance of the global + // Response, but tagged as one. + class ForeignResponse { + readonly [Symbol.toStringTag] = 'Response' + readonly status = 502 + readonly headers = new Headers({ + 'content-type': 'text/html', + 'set-cookie': 'upstream=1; Path=/', + 'www-authenticate': 'Basic realm="upstream"', + }) + } + const handler = createResponseHandler(() => { + throw new Error('upstream failed', { cause: new ForeignResponse() }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(502) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('www-authenticate')).toBeNull() + expect(response.headers.getSetCookie()).toEqual([]) + }) + + it('strips body framing headers from explicit error headers', async () => { + const handler = createResponseHandler(() => { + throw Object.assign(new Error('handled'), { + status: 401, + headers: { + connection: 'close', + 'content-encoding': 'br', + 'content-length': '1', + 'content-range': 'bytes 0-0/1', + 'keep-alive': 'timeout=5', + 'transfer-encoding': 'chunked', + 'set-cookie': 'explicit=1; Path=/', + 'www-authenticate': 'Bearer', + }, + }) + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(401) + for (const name of [ + 'connection', + 'content-encoding', + 'content-length', + 'keep-alive', + 'transfer-encoding', + ]) { + expect(response.headers.get(name)).toBeNull() + } + // Headers an application writes for its own error status still apply. + expect(response.headers.get('content-range')).toBe('bytes 0-0/1') + expect(response.headers.get('www-authenticate')).toBe('Bearer') + expect(response.headers.getSetCookie()).toEqual(['explicit=1; Path=/']) + await expect(response.json()).resolves.toMatchObject({ status: 401 }) + }) + + it('keeps helper status over HTTP-style error status', async () => { + const handler = createResponseHandler(() => { + setResponseStatus(401, 'Unauthorized') + const error = new Error('handled') as Error & { status: number } + error.status = 418 + throw error + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(401) + expect(response.statusText).toBe('Unauthorized') + }) + + it('sends a Response thrown by request middleware on a document request unmarked', async () => { + const handler = createResponseHandler(() => { + throw new Response('teapot', { status: 418 }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(418) + expect(response.headers.get('x-tss-raw')).toBeNull() + await expect(response.text()).resolves.toBe('teapot') + }) + + it('rethrows primitive errors', async () => { + const handler = createResponseHandler(() => { + return Promise.reject('primitive failure') + }) + + await expect(handler(new Request('http://localhost/'), {})).rejects.toBe( + 'primitive failure', + ) + }) + + it('does not recover request state from an error outside the active entry', async () => { + const error = Object.assign(new Error('outside'), { + status: 409, + headers: { 'x-error': 'yes' }, + }) + const handler = createResponseHandler(() => { + setResponseHeader('x-helper', 'yes') + throw error + }) + + let caught: unknown + try { + await handler(new Request('http://localhost/'), {}) + } catch (error) { + caught = error + } + + const response = handleStartError(caught) + + expect(response.status).toBe(409) + expect(response.headers.get('x-error')).toBe('yes') + expect(response.headers.get('x-helper')).toBeNull() + }) + + it('returns response errors verbatim outside the active event', () => { + const response = new Response('handled', { status: 418 }) + + expect(handleStartError(response)).toBe(response) + }) + + it('returns a generic response for primitive errors outside the active event', () => { + const response = handleStartError('primitive failure') + + expect(response.status).toBe(500) + expect(response.headers.get('content-type')).toBe('application/json') + }) + + it('cancels returned response bodies when reconciliation drops them', async () => { + let cancelledReason: unknown + let resolveCancel!: () => void + const cancelled = new Promise((resolve) => { + resolveCancel = resolve + }) + const handler = createResponseHandler(() => { + setResponseStatus(204) + return new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([1])) + }, + cancel(reason) { + cancelledReason = reason + resolveCancel() + }, + }), + ) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(204) + expect(response.body).toBe(null) + await expect(cancelled).resolves.toBeUndefined() + expect(cancelledReason).toBe( + 'Response body dropped by Start reconciliation', + ) + }) + + it.each([204, 205, 304])( + 'drops the body of a returned %s response on runtimes that allow one', + async (status) => { + // Bun accepts a body on 204, 205, and 304 responses; Node rejects them. + // This subclass reports the bodyless status for a body-bearing response, + // as Bun would. Fields initialize after the base constructor has + // validated the body. + class BodylessStatusResponse extends Response { + reportsBodylessStatus = true + override get status() { + return this.reportsBodylessStatus ? status : super.status + } + } + let cancelledReason: unknown + const handler = createResponseHandler( + () => + new BodylessStatusResponse( + new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([1])) + }, + cancel(reason) { + cancelledReason = reason + }, + }), + { headers: { 'x-returned': 'yes' } }, + ), + ) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(status) + expect(response.body).toBeNull() + expect(response.headers.get('x-returned')).toBe('yes') + await vi.waitFor(() => + expect(cancelledReason).toBe( + 'Response body dropped by Start reconciliation', + ), + ) + }, + ) + + it('falls back from informational statuses that Fetch responses cannot use', async () => { + const handler = createResponseHandler(() => { + setResponseStatus(101) + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(200) + }) + + it('keeps the previous status when a helper write is out of range', async () => { + const handler = createResponseHandler(() => { + setResponseStatus(418) + setResponseStatus(700) + return new Response('ok') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(418) + }) + + it.each([101, 199, 600, 999, 404.5])( + 'ignores setResponseStatus(%s) instead of overriding a returned status', + async (status) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(status, 'Ignored') + return new Response('missing', { + status: 404, + statusText: 'Not Found', + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(404) + expect(response.statusText).toBe('Not Found') + expect(warnSpy).toHaveBeenCalledOnce() + expect(warnSpy.mock.calls[0]![0]).toContain( + `setResponseStatus(${status}) was ignored`, + ) + } finally { + warnSpy.mockRestore() + } + }, + ) + + it.each([0, Number.NaN])( + 'ignores setResponseStatus(%s) with its status text', + async (status) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(status, 'Ignored') + return new Response('missing', { + status: 404, + statusText: 'Not Found', + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(404) + expect(response.statusText).toBe('Not Found') + expect(warnSpy).toHaveBeenCalledOnce() + } finally { + warnSpy.mockRestore() + } + }, + ) + + it('ignores out-of-range statuses without a warning in production', async () => { + vi.stubEnv('NODE_ENV', 'production') + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(999) + return new Response('missing', { status: 404 }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(404) + expect(warnSpy).not.toHaveBeenCalled() + } finally { + warnSpy.mockRestore() + vi.unstubAllEnvs() + } + }) + + it('keeps the uncaught error status and log after an ignored status write', async () => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const handler = createResponseHandler(() => { + setResponseStatus(999) + throw new Error('unexpected failure') + }) + + const response = await createServerEntry({ fetch: handler }).fetch( + new Request('http://localhost/'), + {}, + ) + + expect(response.status).toBe(500) + await expect(response.json()).resolves.toMatchObject({ + status: 500, + unhandled: true, + }) + expect(consoleError).toHaveBeenCalledOnce() + } finally { + warnSpy.mockRestore() + consoleError.mockRestore() + } + }) +}) + describe('createStartHandler redirect safety', () => { + it('publishes early normalized redirects with helper writes from the custom entry', async () => { + const handler = createStartHandler(() => { + throw new Error('Early redirects should not render HTML') + }) + const entry = createServerEntry({ + fetch: async (request, options) => { + setCookie('entry', 'visited') + const response = await handler(request, options) + expect(getResponseStatus()).toBe(308) + expect(getResponseHeader('location')).toBe('http://localhost/target') + expect(getResponseHeaders().getSetCookie()).toEqual([ + 'entry=visited; Path=/', + ]) + return response + }, + }) + + const response = await entry.fetch( + new Request('http://localhost//target'), + {}, + ) + + expect(response.status).toBe(308) + expect(response.headers.getSetCookie()).toEqual(['entry=visited; Path=/']) + }) + + it.each(['GET', 'HEAD'])( + 'publishes the final %s server-function redirect response to custom-entry helpers', + async (method) => { + startMocks.routerFactory = makeRouter + startMocks.serverFnResult = redirect({ to: '/login' }) + const handler = createStartHandler(() => { + throw new Error('Server function redirects should not render HTML') + }) + const entry = createServerEntry({ + fetch: async (request, options) => { + const response = await handler(request, options) + expect(getResponseStatus()).toBe(200) + expect(getResponseHeader('location')).toBeUndefined() + expect(getResponseHeaders().get('content-type')).toBe( + 'application/json', + ) + return response + }, + }) + + const response = await entry.fetch( + new Request('http://localhost/_serverFn/test', { + method, + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(200) + expect(response.headers.get('location')).toBeNull() + if (method === 'HEAD') { + expect(response.body).toBeNull() + } else { + await expect(response.json()).resolves.toMatchObject({ + href: '/login', + isSerializedRedirect: true, + }) + } + }, + ) + it.each( [false, true].flatMap((rpc) => ['relative-to', 'functional-options'].flatMap((options) => @@ -203,7 +1307,7 @@ describe('createStartHandler redirect safety', () => { } else { startMocks.requestMiddleware = [createMiddleware().server(() => result)] } - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request(`http://localhost/${rpc ? '_serverFn/test' : ''}`, { headers: rpc ? { 'x-tsr-serverFn': 'true' } : undefined, @@ -212,7 +1316,9 @@ describe('createStartHandler redirect safety', () => { ) const blocked = href.startsWith('//') expect(response.status).toBe(blocked ? 500 : rpc ? 200 : 307) - expect(response.headers.get('Location')).toBe(blocked ? null : '/login') + expect(response.headers.get('Location')).toBe( + blocked || rpc ? null : '/login', + ) expect(factory).toHaveBeenCalledTimes(href === '/login' ? 0 : 1) expect(updater).not.toHaveBeenCalled() expect(hash).not.toHaveBeenCalled() @@ -252,10 +1358,9 @@ describe('createStartHandler redirect safety', () => { hash: option === 'hash' ? hash : undefined, }) startMocks.requestMiddleware = [createMiddleware().server(() => result)] - const response = await createStartHandler(() => new Response('unused'))( - new Request('http://localhost/'), - {}, - ) + const response = await createTestStartHandler( + () => new Response('unused'), + )(new Request('http://localhost/'), {}) expect(response.status).toBe(500) expect(response.headers.get('Location')).toBeNull() expect(factory).not.toHaveBeenCalled() @@ -278,7 +1383,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const response = await createStartHandler(() => new Response('unused'))( + const response = await createTestStartHandler(() => new Response('unused'))( new Request('http://localhost/'), {}, ) @@ -300,7 +1405,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href })), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -317,7 +1422,7 @@ describe('createStartHandler redirect safety', () => { href: '/ignored', headers: { Location: '/login', 'set-cookie': 'session=secret; HttpOnly' }, }) - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -327,7 +1432,7 @@ describe('createStartHandler redirect safety', () => { ) expect(response.status).toBe(200) - expect(response.headers.get('Location')).toBe('/login') + expect(response.headers.get('Location')).toBeNull() expect(response.headers.get('set-cookie')).toBe('session=secret; HttpOnly') const body = await response.json() expect(body).toMatchObject({ href: '/login', isSerializedRedirect: true }) @@ -356,7 +1461,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -379,13 +1484,33 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) expect(response.status).toBe(307) expect(response.headers.get('Location')).toBe('/work?next=home') expect(factory).toHaveBeenCalledTimes(1) }) + it('resolves redirects thrown by a server handlers factory before route middleware runs', async () => { + startMocks.router = makeRouter({ + server: { + handlers: () => { + setCookie('factory', 'visited') + throw redirect({ to: '/login' }) + }, + }, + }) + const render = vi.fn(() => new Response('must not render')) + const handler = createTestStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(307) + expect(response.headers.get('Location')).toBe('/login') + expect(response.headers.getSetCookie()).toEqual(['factory=visited; Path=/']) + expect(render).not.toHaveBeenCalled() + }) + it.each([ { href: '/login', status: 307, factories: 0, location: '/login' }, { href: '/\\evil.example', status: 500, factories: 1, location: null }, @@ -408,7 +1533,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) expect(response.status).toBe(status) expect(response.headers.get('Location')).toBe(location) @@ -430,7 +1555,7 @@ describe('createStartHandler redirect safety', () => { async ({ href, rpc }) => { startMocks.router = makeRouter() startMocks.serverFnResult = redirect({ href }) - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -449,7 +1574,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href: '/\\evil.example' })), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -463,7 +1588,7 @@ describe('createStartHandler redirect safety', () => { href: '/safe', headers: { 'set-cookie': 'session=secret; HttpOnly' }, }) - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -485,6 +1610,61 @@ describe('createStartHandler redirect safety', () => { ) }) + it.each(['href', 'to'] as const)( + 'snapshots RPC redirect headers before %s option serialization writes helpers', + async (target) => { + startMocks.routerFactory = makeRouter + const callerHeaders = new Headers([ + ['x-snapshot', 'before'], + ['set-cookie', 'first=1; Path=/'], + ['set-cookie', 'second=2; Path=/'], + ]) + const state = { + toJSON() { + source.headers.set('x-snapshot', 'after') + source.headers.append('set-cookie', 'late=3; Path=/') + setResponseHeader('x-serialization', 'complete') + appendResponseHeader('x-steps', 'serialized') + return { serialized: true } + }, + } + const options = { [target]: '/safe', headers: callerHeaders, state } + const source = redirect(options) + startMocks.serverFnResult = source + const handler = createTestStartHandler(() => new Response('unused')) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.headers.get('x-snapshot')).toBe('before') + expect(response.headers.getSetCookie()).toEqual([ + 'first=1; Path=/', + 'second=2; Path=/', + ]) + expect(response.headers.get('x-serialization')).toBe('complete') + expect(response.headers.get('x-steps')).toBe('serialized') + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('location')).toBeNull() + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('x-tss-serialized')).toBeNull() + expect(await response.json()).toEqual( + expect.objectContaining({ + href: '/safe', + state: { serialized: true }, + isSerializedRedirect: true, + }), + ) + expect(source.headers.get('x-snapshot')).toBe('after') + expect(options.headers).toBe(callerHeaders) + expect(callerHeaders.get('x-snapshot')).toBe('before') + expect(options.state).toBe(state) + }, + ) + it('preserves redirect headers and caller options across RPC then native form reuse', async () => { const headers = { Location: '/work', @@ -494,7 +1674,7 @@ describe('createStartHandler redirect safety', () => { const options = { href: '/work', statusCode: 303, headers } const result = redirect(options) startMocks.serverFnResult = result - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const rpcResponse = await handler( new Request('http://localhost/_serverFn/test', { @@ -530,7 +1710,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href: '/safe' })), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/', { @@ -557,7 +1737,7 @@ describe('createStartHandler redirect safety', () => { ...('hash' in target ? { Location: '/work' } : undefined), }, }) - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -582,6 +1762,225 @@ describe('createStartHandler redirect safety', () => { ) }) +describe('createStartHandler request location reuse', () => { + it.each( + ['plain', 'café'].flatMap((path) => + [false, true].map((renderApp) => ({ path, renderApp })), + ), + )( + 'rewrites once for $path (renderApp=$renderApp)', + async ({ path, renderApp }) => { + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = url.pathname.replace('/public/', '/') + return url + }) + const middlewarePathnames: Array = [] + const routeMiddleware = createMiddleware().server( + ({ pathname, next }) => { + middlewarePathnames.push(pathname) + return next() + }, + ) + const serverHandler = vi.fn() + const rootRoute = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => rootRoute, + path, + component: () => null, + server: { + middleware: [routeMiddleware], + handlers: { + GET: ({ pathname, next }) => { + serverHandler(pathname) + return renderApp ? next() : new Response('server response') + }, + }, + }, + }) + const router = new RouterCore( + { + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: rootRoute.addChildren([route]), + rewrite: { + input, + output: ({ url }) => { + url.pathname = `/public${url.pathname}` + return url + }, + }, + }, + getStoreConfig, + ) + router.isServer = true + startMocks.router = router + input.mockClear() + const getMatchedRoutes = vi.spyOn(router, 'getMatchedRoutes') + const render = vi.fn(() => new Response('app response')) + const handler = createStartHandler(render) + + const response = await handler( + new Request( + `http://localhost/public/${encodeURIComponent(path)}?view=full#section`, + ), + {}, + ) + + expect(response.status).toBe(200) + expect(await response.text()).toBe( + renderApp ? 'app response' : 'server response', + ) + expect(input).toHaveBeenCalledOnce() + expect(serverHandler).toHaveBeenCalledExactlyOnceWith(`/${path}`) + expect(middlewarePathnames).toEqual([`/${path}`]) + expect(render).toHaveBeenCalledTimes(renderApp ? 1 : 0) + expect( + getMatchedRoutes.mock.calls.every( + ([pathname]) => pathname === `/${path}`, + ), + ).toBe(true) + if (renderApp) { + expect(router.state.matches.at(-1)?.routeId).toBe(route.id) + } + }, + ) + + it('uses the configured origin for server route rewrites', async () => { + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = + url.hostname === 'public.example' ? '/work' : '/wrong-origin' + return url + }) + const router = makeRouterWithRouteWork({}) + router.update({ + origin: 'https://public.example', + rewrite: { + input, + output: ({ url }) => { + url.pathname = '/public' + return url + }, + }, + }) + const serverHandler = vi.fn(() => new Response('server response')) + router.routesById['/work']!.options.server = { + handlers: { GET: serverHandler }, + } + startMocks.router = router + input.mockClear() + const handler = createStartHandler(() => new Response('app response')) + + const response = await handler( + new Request('http://internal.example/public'), + {}, + ) + + expect(response.status).toBe(200) + expect(await response.text()).toBe('server response') + expect(serverHandler).toHaveBeenCalledOnce() + expect(input).toHaveBeenCalledOnce() + }) + + it('reuses search parsed after route middleware updates the router', async () => { + const parseSearch = vi.fn((search: string) => + Object.fromEntries(new URLSearchParams(search)), + ) + const middleware = createMiddleware().server(({ next }) => { + startMocks.router!.update({ + parseSearch, + stringifySearch: (search) => + `?${new URLSearchParams(search).toString()}`, + }) + return next() + }) + const root = new BaseRootRoute() + const route = new BaseRoute({ + getParentRoute: () => root, + path: '/work', + component: () => null, + loader: ({ location }) => location.search, + server: { middleware: [middleware] }, + }) + startMocks.router = new RouterCore( + { isServer: true, routeTree: root.addChildren([route]) }, + getStoreConfig, + ) + const handler = createStartHandler(({ router }) => + Response.json({ + search: router.state.location.search, + loaderData: router.state.matches.at(-1)?.loaderData, + }), + ) + + const response = await handler( + new Request('http://localhost/work?page=2'), + {}, + ) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + search: { page: '2' }, + loaderData: { page: '2' }, + }) + expect(parseSearch).toHaveBeenCalledExactlyOnceWith('?page=2') + }) + + // Handlers receive the router's pathname: decoded, except for characters + // that would change how the path is read. + it.each([ + ['a/b', 'a%2Fb'], + ['a%b', 'a%25b'], + ['a b', 'a b'], + ['a?b', 'a%3Fb'], + ['a#b', 'a%23b'], + ])( + 'preserves encoded params %j when a server handler continues to SSR', + async (value, pathname) => { + const handlerParams: Array = [] + const handlerPathnames: Array = [] + const root = new BaseRootRoute() + const route = new BaseRoute({ + getParentRoute: () => root, + path: '/params/$value', + component: () => null, + loader: ({ params }) => params.value, + server: { + handlers: { + GET: ({ params, pathname, next }) => { + handlerParams.push(params.value) + handlerPathnames.push(pathname) + params.value = 'changed by server handler' + return next() + }, + }, + }, + }) + startMocks.router = new RouterCore( + { isServer: true, routeTree: root.addChildren([route]) }, + getStoreConfig, + ) + const handler = createStartHandler(({ router }) => + Response.json({ + params: router.state.matches.at(-1)?.params, + loaderData: router.state.matches.at(-1)?.loaderData, + }), + ) + + const response = await handler( + new Request(`http://localhost/params/${encodeURIComponent(value)}`), + {}, + ) + + expect(response.status).toBe(200) + expect(handlerParams).toEqual([value]) + expect(handlerPathnames).toEqual([`/params/${pathname}`]) + expect(await response.json()).toEqual({ + params: { value }, + loaderData: value, + }) + }, + ) +}) + it('keeps the request URL when server code attempts navigation', async () => { const loader = vi.fn(async () => { const router = startMocks.router! @@ -593,7 +1992,7 @@ it('keeps the request URL when server code attempts navigation', async () => { const router = makeRouterWithRouteWork({ loader }) startMocks.router = router const load = vi.spyOn(router, 'load') - const handler = createStartHandler(({ router: loadedRouter }) => { + const handler = createTestStartHandler(({ router: loadedRouter }) => { expect(loadedRouter.state.location.pathname).toBe('/work') expect(loadedRouter.history.location.pathname).toBe('/work') expect(loadedRouter.history.length).toBe(1) @@ -611,7 +2010,7 @@ describe('createStartHandler router request Accept handling', () => { it('returns 406 JSON for router requests that do not accept HTML', async () => { startMocks.routerFactory = vi.fn(makeRouter) const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -633,7 +2032,7 @@ describe('createStartHandler router request Accept handling', () => { async (accept) => { startMocks.routerFactory = vi.fn(makeRouter) const render = vi.fn(() => new Response('ok')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -650,6 +2049,384 @@ describe('createStartHandler router request Accept handling', () => { }) describe('createStartHandler SSR cleanup ownership', () => { + it.each([204, 200])( + 'preserves cancellation helper writes when a short-circuit body is dropped and cleanup selects %s without a router', + async (status) => { + const routerFactory = vi.fn(makeRouter) + startMocks.routerFactory = routerFactory + const cancel = vi.fn(() => { + setResponseStatus(status) + setCookie('cleanup', 'visited') + setResponseHeader('x-cleanup', 'complete') + appendResponseHeader('x-cleanup-steps', 'cancelled') + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setResponseStatus(204) + return new Response(new ReadableStream({ cancel }), { + headers: { 'x-cleanup-steps': 'initial' }, + }) + }), + ] + const render = vi.fn(() => new Response('must not render')) + const handler = createTestStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(routerFactory).not.toHaveBeenCalled() + expect(render).not.toHaveBeenCalled() + expect(cancel).toHaveBeenCalledOnce() + expect(response.status).toBe(status) + expect(response.body).toBeNull() + expect(response.headers.getSetCookie()).toEqual([ + 'cleanup=visited; Path=/', + ]) + expect(response.headers.get('x-cleanup')).toBe('complete') + expect(response.headers.get('x-cleanup-steps')).toBe('initial, cancelled') + }, + ) + + it('preserves cancellation helper writes when outermost middleware replaces a server-function response without a router', async () => { + const routerFactory = vi.fn(makeRouter) + startMocks.routerFactory = routerFactory + const cancel = vi.fn(() => { + setCookie('cleanup', 'visited') + setResponseHeader('x-cleanup', 'complete') + appendResponseHeader('x-cleanup-steps', 'cancelled') + }) + startMocks.serverFnHandler = () => + new Response(new ReadableStream({ cancel })) + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + await next() + return new Response('replacement', { + headers: { 'x-cleanup-steps': 'replacement' }, + }) + }), + ] + const render = vi.fn(() => new Response('must not render')) + const handler = createTestStartHandler(render) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(routerFactory).not.toHaveBeenCalled() + expect(render).not.toHaveBeenCalled() + expect(startMocks.serverFnCalls).toHaveLength(1) + expect(cancel).toHaveBeenCalledOnce() + expect(response.status).toBe(200) + expect(response.headers.getSetCookie()).toEqual(['cleanup=visited; Path=/']) + expect(response.headers.get('x-cleanup')).toBe('complete') + expect(response.headers.get('x-cleanup-steps')).toBe( + 'replacement, cancelled', + ) + await expect(response.text()).resolves.toBe('replacement') + }) + + it.each(['drop', 'replace'] as const)( + 'preserves cleanup helper writes when middleware disposes SSR through %s', + async (mode) => { + const router = makeRouter() + startMocks.router = router + const cancel = vi.fn() + const cleanup = vi.fn(() => { + setResponseHeader('x-cleanup', 'complete') + setCookie('cleanup', 'visited') + }) + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + if (mode === 'drop') { + setResponseStatus(204) + return result + } + return new Response('replacement') + }), + ] + const handler = createTestStartHandler(({ router: requestRouter }) => { + requestRouter.serverSsr!.onCleanup(cleanup) + return createSsrStreamResponse( + requestRouter, + new Response(new ReadableStream({ cancel })), + ) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(cancel).toHaveBeenCalledOnce() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + expect(response.headers.get('x-cleanup')).toBe('complete') + expect(response.headers.getSetCookie()).toEqual([ + 'cleanup=visited; Path=/', + ]) + if (mode === 'drop') { + expect(response.status).toBe(204) + expect(response.body).toBeNull() + } else { + expect(response.status).toBe(200) + await expect(response.text()).resolves.toBe('replacement') + } + }, + ) + + it('preserves response helper writes made by eager SSR cleanup callbacks', async () => { + const router = makeRouter() + startMocks.router = router + const cleanup = vi.fn(() => { + setResponseStatus(202, 'Accepted') + setResponseHeader('x-cleanup', 'complete') + setCookie('cleanup', 'visited') + }) + const handler = createTestStartHandler(({ router: requestRouter }) => { + requestRouter.serverSsr!.onCleanup(cleanup) + return new Response('eager document') + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + expect(response.status).toBe(202) + expect(response.statusText).toBe('Accepted') + expect(response.headers.get('x-cleanup')).toBe('complete') + expect(response.headers.getSetCookie()).toEqual(['cleanup=visited; Path=/']) + await expect(response.text()).resolves.toBe('eager document') + }) + + it('preserves helper appends when an eager renderer cleans up before returning', async () => { + const router = makeRouter() + startMocks.router = router + const handler = createTestStartHandler(({ router: requestRouter }) => { + requestRouter.serverSsr!.onCleanup(() => { + setResponseStatus(202, 'Accepted') + appendResponseHeader('x-steps', 'cleanup') + setCookie('cleanup', 'visited') + }) + requestRouter.serverSsr!.cleanup() + return new Response('eager document', { + headers: { 'x-steps': 'render' }, + }) + }) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(router.serverSsr).toBeUndefined() + expect(response.status).toBe(202) + expect(response.statusText).toBe('Accepted') + expect(response.headers.get('x-steps')).toBe('render, cleanup') + expect(response.headers.getSetCookie()).toEqual(['cleanup=visited; Path=/']) + await expect(response.text()).resolves.toBe('eager document') + }) + + it.each([ + { method: 'GET', status: 204, hasBody: true }, + { method: 'HEAD', status: 200, hasBody: false }, + ])( + 'serializes $method RPC redirect options with helper status $status', + async ({ method, status, hasBody }) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const toJSON = vi.fn(() => { + clearResponseHeaders() + setResponseStatus(status) + setResponseHeader('content-type', 'text/plain') + setResponseHeader('location', '/ignored') + setResponseHeader('x-tss-serialized', 'true') + setResponseHeader('x-tss-raw', 'true') + appendResponseHeader('x-steps', 'serialized') + setCookie('serialization', 'visited') + return { serialized: true } + }) + startMocks.serverFnResult = redirect({ href: '/safe', state: { toJSON } }) + const handler = createTestStartHandler(() => new Response('unused')) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + method, + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + warnSpy.mockRestore() + expect(toJSON).toHaveBeenCalledOnce() + // The client decodes the envelope, so a bodyless helper status is + // ignored. Only HEAD drops the body. + expect(response.status).toBe(200) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('location')).toBeNull() + expect(response.headers.get('x-tss-serialized')).toBeNull() + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('x-steps')).toBe('serialized') + expect(response.headers.getSetCookie()).toEqual([ + 'serialization=visited; Path=/', + ]) + if (hasBody) { + await expect(response.json()).resolves.toMatchObject({ + href: '/safe', + isSerializedRedirect: true, + }) + } else { + expect(response.body).toBeNull() + } + }, + ) + + it('rejects an RPC redirect whose options cannot be serialized as JSON', async () => { + const options = { href: '/safe', toJSON: () => undefined } + startMocks.serverFnResult = redirect(options) + const handler = createStartHandler(() => new Response('unused')) + + await expect( + handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ), + ).rejects.toThrow('Value is not JSON serializable') + }) + + it('does not duplicate helper cookies across repeated reconciliation', async () => { + startMocks.serverFnResult = new Response('ok') + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + setCookie('first', '1', { path: '/' }) + const result = await next() + setCookie('second', '2', { path: '/' }) + return result + }), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + const cookies = getSetCookieValues(response.headers) + + expect( + cookies.filter((cookie) => cookie.startsWith('first=1;')), + ).toHaveLength(1) + expect( + cookies.filter((cookie) => cookie.startsWith('second=2;')), + ).toHaveLength(1) + }) + + it('does not duplicate cookies the cookie parser rejects across middleware levels', async () => { + const longValue = 'x'.repeat(5000) + startMocks.serverFnResult = new Response('ok') + const passThrough = createMiddleware().server(({ next }) => next()) + startMocks.requestMiddleware = [ + passThrough, + createMiddleware().server(({ next }) => next()), + createMiddleware().server(async ({ next }) => { + setCookie('constructor', '1', { path: '/' }) + setCookie('long', longValue, { path: '/' }) + return next() + }), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + const cookies = getSetCookieValues(response.headers) + + expect( + cookies.filter((cookie) => cookie.startsWith('constructor=1;')), + ).toHaveLength(1) + expect( + cookies.filter((cookie) => cookie.startsWith(`long=${longValue};`)), + ).toHaveLength(1) + }) + + it('disposes stream response when later reconciliation drops the body', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + setResponseStatus(204) + return result + }), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(204) + expect(response.body).toBe(null) + expect(dispose).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + it('converts middleware errors by default', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + await next() + throw new Error('middleware failed') + }), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(500) + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(dispose).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + it('passes request middleware context to server functions', async () => { + startMocks.serverFnResult = new Response('ok') + startMocks.requestMiddleware = [ + createMiddleware().server(({ next }) => { + return next({ context: { middleware: 'yes' } }) + }), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(startMocks.serverFnCalls).toHaveLength(1) + expect(startMocks.serverFnCalls[0]?.context).toMatchObject({ + middleware: 'yes', + }) + }) + it('preserves serverFn stream cleanup ownership through early return', async () => { startMocks.requestMiddleware = [] const router = makeRouter() @@ -658,7 +2435,7 @@ describe('createStartHandler SSR cleanup ownership', () => { startMocks.serverFnResult = ssrResponse const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -702,7 +2479,7 @@ describe('createStartHandler SSR cleanup ownership', () => { ), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -722,6 +2499,66 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(await response.text()).toBe('timeout') }) + it.each(['shared result', 'captured response'] as const)( + 'keeps an inner fallback when the result it abandoned settles while an outer middleware awaits (%s)', + async (returned) => { + let resolveInner!: (response: Response) => void + startMocks.serverFnHandler = () => + new Promise((resolve) => { + resolveInner = resolve + }) + const timeoutCancel = vi.fn() + const timeoutResponse = new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('timeout')) + controller.close() + }, + cancel: timeoutCancel, + }), + { status: 504 }, + ) + const innerCancel = vi.fn() + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + const captured = result.response + // The abandoned inner result settles while this middleware awaits. + resolveInner( + new Response(new ReadableStream({ cancel: innerCancel }), { + status: 200, + }), + ) + await new Promise((resolve) => setTimeout(resolve, 10)) + return returned === 'shared result' ? result : captured + }), + createMiddleware().server(({ next }) => + Promise.race([ + next(), + new Promise((resolve) => + setTimeout(() => resolve(timeoutResponse), 5), + ), + ]), + ), + ] + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(504) + expect(timeoutCancel).not.toHaveBeenCalled() + expect(innerCancel).toHaveBeenCalledExactlyOnceWith( + 'late middleware response', + ) + expect(await response.text()).toBe('timeout') + }, + ) + it('disposes stream response replaced by middleware result', async () => { const router = makeRouter() startMocks.router = router @@ -736,7 +2573,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -765,7 +2602,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -794,7 +2631,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -810,6 +2647,61 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) + it('adopts a replacement registered on a directly returned next promise', async () => { + startMocks.router = makeRouter() + const cancel = vi.fn() + const original = new Response(new ReadableStream({ cancel })) + const replacement = new Response('replacement') + const cancelReplacement = vi.spyOn(replacement.body!, 'cancel') + startMocks.requestMiddleware = [ + createMiddleware().server(({ next }) => { + const pending = Promise.resolve(next()) + void pending.then((result) => { + result.response = replacement + }) + return pending + }), + ] + + const handler = createTestStartHandler(() => original) + const response = await handler(new Request('http://localhost/'), {}) + + expect(response).toBe(replacement) + expect(cancel).toHaveBeenCalledExactlyOnceWith( + 'middleware response replaced', + ) + expect(cancelReplacement).not.toHaveBeenCalled() + await expect(response.text()).resolves.toBe('replacement') + }) + + it('disposes SSR ownership when a directly returned next promise drops the body', async () => { + const router = makeRouter() + startMocks.router = router + const cancel = vi.fn() + startMocks.requestMiddleware = [ + createMiddleware().server(({ next }) => { + const pending = Promise.resolve(next()) + void pending.then(() => { + setResponseStatus(204) + }) + return pending + }), + ] + + const handler = createTestStartHandler(({ router: requestRouter }) => + createSsrStreamResponse( + requestRouter, + new Response(new ReadableStream({ cancel })), + ), + ) + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(204) + expect(response.body).toBeNull() + expect(cancel).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + it.each(['return', 'mutate', 'throw'] as const)( 'cancels a plain stream that outer middleware replaces via %s', async (mode) => { @@ -832,7 +2724,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -840,7 +2732,14 @@ describe('createStartHandler SSR cleanup ownership', () => { {}, ) - expect(response).toBe(replacement) + if (mode === 'throw') { + // A Response thrown on a server-function request is marked so the + // client rejects the call; the marked copy keeps the same body. + expect(response.headers.get('x-tss-raw')).toBe('thrown') + await expect(response.text()).resolves.toBe('replacement') + } else { + expect(response).toBe(replacement) + } expect(cancel).toHaveBeenCalledOnce() expect(cancel).toHaveBeenCalledWith('middleware response replaced') }, @@ -869,7 +2768,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -897,7 +2796,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -915,6 +2814,67 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) + it('keeps stream ownership when Start rebuilds a response with a wrapped Response', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + // Start rebuilds the response to apply this header. + setResponseHeader('x-after-next', 'yes') + return result + }), + ] + // A wrapped global Response that copies stream bodies into new streams, + // reading the original only once the copy is read. + vi.stubGlobal( + 'Response', + new Proxy(Response, { + construct(target, [body, init], newTarget) { + if (body instanceof ReadableStream) { + const source: ReadableStream = body + let reader: ReadableStreamDefaultReader | undefined + body = new ReadableStream({ + async pull(controller) { + reader ??= source.getReader() + const chunk = await reader.read() + if (chunk.done) { + controller.close() + } else { + controller.enqueue(chunk.value) + } + }, + cancel(reason) { + return reader ? reader.cancel(reason) : source.cancel(reason) + }, + }) + } + return Reflect.construct(target, [body, init], newTarget) + }, + }), + ) + + try { + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.headers.get('x-after-next')).toBe('yes') + expect(dispose).not.toHaveBeenCalled() + await expect(response.text()).resolves.toBe('stream') + expect(router.serverSsr).toBeUndefined() + } finally { + vi.unstubAllGlobals() + } + }) + it('preserves stream ownership when middleware pipes the body', async () => { const router = makeRouter() startMocks.router = router @@ -925,18 +2885,15 @@ describe('createStartHandler SSR cleanup ownership', () => { startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { const result = await next() - wrappedResponse = transferResponseBodyOwnership( + wrappedResponse = new Response( + result.response.body!.pipeThrough(new TransformStream()), result.response, - new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ), ) return wrappedResponse }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -961,17 +2918,14 @@ describe('createStartHandler SSR cleanup ownership', () => { startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { const result = await next() - return transferResponseBodyOwnership( + return new Response( + result.response.body!.pipeThrough(new TransformStream()), result.response, - new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ), ) }), ] const requestController = new AbortController() - const handler = createStartHandler( + const handler = createTestStartHandler( ({ router: requestRouter, request }) => { const responseBody = useRouterTransform ? transformReadableStreamWithRouter(requestRouter, source, { @@ -1014,20 +2968,20 @@ describe('createStartHandler SSR cleanup ownership', () => { const ssrResponse = makeCompletingStreamResponse(router) startMocks.serverFnResult = ssrResponse const dispose = vi.spyOn(ssrResponse as any, 'dispose') - let siblingResponse!: Response + let siblingText!: Promise startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { const result = await next() - siblingResponse = result.response - result.response = transferResponseBodyOwnership( - siblingResponse, - siblingResponse.clone(), - ) + const siblingResponse = result.response + result.response = siblingResponse.clone() + // The branch middleware keeps must be read or cancelled. An unread + // branch is abandoned with the stream. + siblingText = siblingResponse.text() return result }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1036,9 +2990,10 @@ describe('createStartHandler SSR cleanup ownership', () => { ) expect(dispose).not.toHaveBeenCalled() - await expect( - Promise.all([response.text(), siblingResponse.text()]), - ).resolves.toEqual(['stream', 'stream']) + await expect(Promise.all([response.text(), siblingText])).resolves.toEqual([ + 'stream', + 'stream', + ]) expect(router.serverSsr).toBeUndefined() }) @@ -1058,19 +3013,16 @@ describe('createStartHandler SSR cleanup ownership', () => { }), createMiddleware().server(async ({ next }) => { const result = await next() - const response = transferResponseBodyOwnership( + const response = new Response( + result.response.body!.pipeThrough(new TransformStream()), result.response, - new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ), ) derivedCancel = vi.spyOn(response.body!, 'cancel') return response }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1111,7 +3063,7 @@ describe('createStartHandler SSR cleanup ownership', () => { ] try { - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1148,7 +3100,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1163,38 +3115,44 @@ describe('createStartHandler SSR cleanup ownership', () => { reader?.releaseLock() }) - it('disposes a locked stream replaced by an unrelated body', async () => { + it('leaves a stream that middleware reads to the response that replaces it', async () => { const router = makeRouter() startMocks.router = router const ssrResponse = makeStreamResponse(router) startMocks.serverFnResult = ssrResponse const dispose = vi.spyOn(ssrResponse as any, 'dispose') const replacement = new Response('replacement') + const requestController = new AbortController() let reader: ReadableStreamDefaultReader | undefined startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { const result = await next() + // A reader is indistinguishable from a pipe that feeds the + // replacement, so Start must not dispose the stream under it. reader = result.response.body!.getReader() return replacement }), ] try { - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, }), {}, ) expect(response).toBe(replacement) - await expect(response.text()).resolves.toBe('replacement') - expect(dispose).toHaveBeenCalledOnce() - expect(dispose).toHaveBeenCalledWith('middleware response replaced') + expect(dispose).not.toHaveBeenCalled() + expect(router.serverSsr).toBeDefined() + + const reason = new Error('request disconnected') + requestController.abort(reason) + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) expect(router.serverSsr).toBeUndefined() } finally { - await reader?.cancel('test cleanup') reader?.releaseLock() } }) @@ -1214,7 +3172,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1243,7 +3201,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1251,7 +3209,10 @@ describe('createStartHandler SSR cleanup ownership', () => { {}, ) - expect(response).toBe(replacement) + // The client-facing copy is marked as thrown and keeps the same body. + expect(response.status).toBe(418) + expect(response.headers.get('x-tss-raw')).toBe('thrown') + await expect(response.text()).resolves.toBe('handled') expect(dispose).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) @@ -1272,7 +3233,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1280,9 +3241,14 @@ describe('createStartHandler SSR cleanup ownership', () => { {}, ) - expect(response).toBe(replacement) + // The client-facing copy is marked as thrown and keeps the same body. + expect(response.status).toBe(418) + expect(response.headers.get('x-tss-raw')).toBe('thrown') + await expect(response.text()).resolves.toBe('handled') expect(dispose).toHaveBeenCalledOnce() - await cloneCancellation + // The clone's cancellation races Start's disposal of the shared source: it + // resolves, or rejects with the cleanup's abort. Either way it settles. + await cloneCancellation.catch(() => {}) expect(router.serverSsr).toBeUndefined() }) @@ -1301,7 +3267,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1316,6 +3282,133 @@ describe('createStartHandler SSR cleanup ownership', () => { }) describe('createStartHandler router initialization', () => { + it('keeps adapter order and router adapters isolated to their request', async () => { + const adapter = (key: string) => + createSerializationAdapter({ + key, + test: (value: unknown): value is Date => value instanceof Date, + toSerializable: (value: Date) => value.toISOString(), + fromSerializable: (value: string) => new Date(value), + }) + const startAdapter = adapter('start') + const routerAdapter = adapter('router') + const startAdapters = [startAdapter] + startMocks.serializationAdapters = startAdapters + let requestCount = 0 + startMocks.routerFactory = () => { + const router = makeRouter() + router.options.serializationAdapters = + requestCount++ === 0 ? [routerAdapter] : [] + return router + } + const handler = createStartHandler(({ router }) => + Response.json( + router.options.serializationAdapters?.map(({ key }) => key), + ), + ) + + const first = await handler(new Request('http://localhost/'), {}) + const second = await handler(new Request('http://localhost/'), {}) + + expect(await first.json()).toEqual(['start', '$TSS/serverfn', 'router']) + expect(await second.json()).toEqual(['start', '$TSS/serverfn']) + expect(startAdapters).toEqual([startAdapter]) + }) + + it('normalizes a server function router URL while preserving the incoming URL', async () => { + const requestUrl = + 'http://localhost/_serverFn/test?space=a%20b&tilde=~&bad=%GG&a=1&a=2#part' + let middlewarePathname: string | undefined + let middlewareRequestUrl: string | undefined + let factoryCalls = 0 + startMocks.requestMiddleware = [ + createMiddleware().server(({ pathname, request, next }) => { + middlewarePathname = pathname + middlewareRequestUrl = request.url + return next() + }), + ] + startMocks.routerFactory = () => { + factoryCalls++ + return makeRouter() + } + startMocks.serverFnHandler = async () => { + const [first, second] = await Promise.all([ + getRouterInstance(), + getRouterInstance(), + ]) + return Response.json({ + href: first.history.location.href, + origin: first.options.origin, + requestUrl: getRequestUrl().href, + sameRouter: first === second, + }) + } + + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request(requestUrl, { headers: { 'x-tsr-serverFn': 'true' } }), + {}, + ) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + href: '/_serverFn/test?space=a+b&tilde=%7E&bad=%25GG&a=1&a=2#part', + origin: 'http://localhost', + requestUrl, + sameRouter: true, + }) + expect(middlewarePathname).toBe('/_serverFn/test') + expect(middlewareRequestUrl).toBe(requestUrl) + expect(factoryCalls).toBe(1) + }) + + it.each(['/%5FserverFn/test', '/_serverFn/%74est'])( + 'dispatches an encoded server function pathname: %s', + async (pathname) => { + let middlewarePathname: string | undefined + startMocks.requestMiddleware = [ + createMiddleware().server(({ pathname: currentPathname, next }) => { + middlewarePathname = currentPathname + return next() + }), + ] + startMocks.serverFnHandler = ({ serverFnId }) => { + return Response.json({ serverFnId, requestUrl: getRequestUrl().href }) + } + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request(`http://localhost${pathname}`, { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + serverFnId: 'test', + requestUrl: `http://localhost${pathname}`, + }) + expect(middlewarePathname).toBe('/_serverFn/test') + }, + ) + + it('redirects a protocol-relative server function pathname before dispatch', async () => { + const handler = createTestStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost//_serverFn/test?space=a%20b', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(308) + expect(response.headers.get('location')).toBe( + 'http://localhost/_serverFn/test?space=a+b', + ) + expect(startMocks.serverFnCalls).toHaveLength(0) + }) + it('shares one router between concurrent request-context reads', async () => { let factoryCalls = 0 let instances: Array = [] @@ -1328,7 +3421,7 @@ describe('createStartHandler router initialization', () => { return new Response('ok') } - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1360,7 +3453,7 @@ describe('createStartHandler router initialization', () => { return new Response('ok') } - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1407,7 +3500,7 @@ describe('createStartHandler router initialization', () => { return new Response('late') } - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -1428,6 +3521,49 @@ describe('createStartHandler router initialization', () => { }) describe('createStartHandler direct server routes', () => { + it.each([false, true])( + 'runs shared route middleware once and preserves its context (global=%s)', + async (global) => { + const runMiddleware = vi.fn(({ next }) => + next({ context: { message: 'trusted middleware' } }), + ) + const middleware = createMiddleware().server(runMiddleware) + startMocks.requestMiddleware = global ? [middleware] : [] + const root = new BaseRootRoute({ + server: { middleware: [middleware] }, + }) + startMocks.router = new RouterCore( + { + isServer: true, + routeTree: root.addChildren([ + new BaseRoute({ + getParentRoute: () => root, + path: '/', + component: () => null, + }), + ]), + }, + getStoreConfig, + ) + const handler = createStartHandler<{ + server: { requestContext: { message: string; requestValue: string } } + }>(({ router }) => + Response.json(router.options.additionalContext?.serverContext), + ) + + const response = await handler(new Request('http://localhost/'), { + context: { message: 'request context', requestValue: 'retained' }, + }) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + message: 'trusted middleware', + requestValue: 'retained', + }) + expect(runMiddleware).toHaveBeenCalledOnce() + }, + ) + it('disposes a thrown sole-terminal response when the request aborts after the fast-path check', async () => { const requestController = new AbortController() const cancellation = new Error('request disconnected') @@ -1447,7 +3583,7 @@ describe('createStartHandler direct server routes', () => { startMocks.serverFnHandler = () => { throw thrownResponse } - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1489,7 +3625,7 @@ describe('createStartHandler direct server routes', () => { get: contextGetter, }) startMocks.serverFnHandler = () => directResult - const handler = createStartHandler(() => new Response('unused')) + const handler = createTestStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1521,15 +3657,15 @@ describe('createStartHandler direct server routes', () => { server: { requestContext: { abort: boolean } } }>(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - signal: requestController.signal, - }), - { context: requestContext }, - ) - - expect(response.status).toBe(500) + await expect( + handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, + }), + { context: requestContext }, + ), + ).rejects.toBe(cancellation) expect(serverFnHandler).not.toHaveBeenCalled() }) @@ -1547,7 +3683,7 @@ describe('createStartHandler direct server routes', () => { }) startMocks.router = router const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -1574,7 +3710,7 @@ describe('createStartHandler direct server routes', () => { }) startMocks.router = router const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler(new Request('http://localhost/'), {}) @@ -1751,7 +3887,7 @@ describe('createStartHandler direct server routes', () => { }) startMocks.router = router const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler(new Request('http://localhost/'), {}) @@ -1783,7 +3919,9 @@ describe('createStartHandler direct server routes', () => { }, }) startMocks.router = router - const handler = createStartHandler(() => new Response('must not render')) + const handler = createTestStartHandler( + () => new Response('must not render'), + ) const response = await handler(new Request('http://localhost/'), {}) @@ -1791,23 +3929,148 @@ describe('createStartHandler direct server routes', () => { expect(afterNext).not.toHaveBeenCalled() }) - it('lets a component route handler defer to document rendering with next', async () => { - const routeHandler = vi.fn(({ next }: any) => next()) + it.each(['function', 'object'] as const)( + 'preserves the non-component %s handler next callback', + async (handlerKind) => { + const events: Array = [] + let observedNext: unknown + let caught: unknown + const middleware = createMiddleware().server(async ({ next }) => { + events.push('middleware before') + try { + return await next() + } catch (error) { + caught = error + events.push('middleware caught') + return new Response('cannot defer', { status: 409 }) + } + }) + const routeHandler = vi.fn(({ next }) => { + events.push('handler') + observedNext = next + return next() + }) + startMocks.router = makeRouter({ + component: undefined, + server: { + middleware: [middleware], + handlers: + handlerKind === 'function' + ? { GET: routeHandler } + : ({ + createHandlers, + }: HandlersFnOpts<{}, AnyRoute, '/', {}, undefined>) => + createHandlers({ GET: { handler: routeHandler } }), + }, + }) + const render = vi.fn(() => new Response('must not render')) + const handler = createTestStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(observedNext).toBeTypeOf('function') + expect(caught).toBeInstanceOf(Error) + expect(caught).not.toBeInstanceOf(TypeError) + expect(response.status).toBe(409) + await expect(response.text()).resolves.toBe('cannot defer') + expect(events).toEqual([ + 'middleware before', + 'handler', + 'middleware caught', + ]) + expect(routeHandler).toHaveBeenCalledOnce() + expect(render).not.toHaveBeenCalled() + }, + ) + + it('lets a component route handler defer context to document rendering with next', async () => { + const events: Array = [] + const requestContext = Object.freeze({ nonce: 'request' }) + const globalContext = Object.freeze({ global: 'yes', shared: 'global' }) + const routeContext = Object.freeze({ route: 'yes', shared: 'route' }) + const handlerContext = Object.freeze({ handler: 'yes', shared: 'handler' }) + let loadedContext: unknown + let resumedContext: unknown + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + events.push('global before') + const result = await next({ context: globalContext }) + events.push('global after') + appendResponseHeader('x-after', 'global') + return result + }), + ] + const middleware = createMiddleware().server(async ({ next }) => { + events.push('route before') + const result = await next({ context: routeContext }) + resumedContext = result.context + events.push('route after') + appendResponseHeader('x-after', 'route') + return result + }) + const routeHandler = vi.fn>( + async ({ next }) => { + events.push('handler before') + const result = await next({ context: handlerContext }) + events.push('handler after') + appendResponseHeader('x-after', 'handler') + return result + }, + ) + const loader = vi.fn( + ({ serverContext }: { serverContext?: Record }) => { + events.push('loader') + loadedContext = serverContext + return 'loaded' + }, + ) const router = makeRouter({ + loader, server: { + middleware: [middleware], handlers: { GET: routeHandler, }, }, }) startMocks.router = router - const render = vi.fn(() => new Response('rendered document')) - const handler = createStartHandler(render) + const render = vi.fn(() => { + events.push('render') + return Response.json({ context: loadedContext }) + }) + const handler = createTestStartHandler(render) - const response = await handler(new Request('http://localhost/'), {}) + const response = await handler(new Request('http://localhost/'), { + context: requestContext, + }) - await expect(response.text()).resolves.toBe('rendered document') + const expectedContext = { + nonce: 'request', + global: 'yes', + route: 'yes', + handler: 'yes', + shared: 'handler', + } + expect(response.status).toBe(200) + await expect(response.json()).resolves.toEqual({ context: expectedContext }) + expect(resumedContext).toEqual(expectedContext) + expect(response.headers.get('x-after')).toBe('handler, route, global') + expect(events).toEqual([ + 'global before', + 'route before', + 'handler before', + 'loader', + 'render', + 'handler after', + 'route after', + 'global after', + ]) + expect(requestContext).toEqual({ nonce: 'request' }) + expect(globalContext).toEqual({ global: 'yes', shared: 'global' }) + expect(routeContext).toEqual({ route: 'yes', shared: 'route' }) + expect(handlerContext).toEqual({ handler: 'yes', shared: 'handler' }) expect(routeHandler).toHaveBeenCalledOnce() + expect(loader).toHaveBeenCalledOnce() expect(render).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) @@ -1837,7 +4100,7 @@ describe('createStartHandler direct server routes', () => { }) startMocks.router = router const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -1867,7 +4130,7 @@ describe('createStartHandler HEAD fallback', () => { const cancel = vi.fn() let cleanupEffects = 0 - const handler = createStartHandler(({ router: requestRouter }) => { + const handler = createTestStartHandler(({ router: requestRouter }) => { requestRouter.serverSsr!.onCleanup(() => { cleanupEffects++ }) @@ -1909,7 +4172,9 @@ describe('createStartHandler HEAD fallback', () => { }) startMocks.router = router - const handler = createStartHandler(() => new Response('must not render')) + const handler = createTestStartHandler( + () => new Response('must not render'), + ) const response = await handler( new Request('http://localhost/', { method: 'HEAD' }), {}, @@ -1943,7 +4208,7 @@ describe('createStartHandler request cancellation', () => { startMocks.router = router const requestController = new AbortController() const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = handler( new Request('http://localhost/work', { signal: requestController.signal, @@ -1981,7 +4246,7 @@ describe('createStartHandler request cancellation', () => { let cleanupEffects = 0 let cancelCalls = 0 let lateStreamResponse!: ReturnType - const handler = createStartHandler(({ router: requestRouter }) => { + const handler = createTestStartHandler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! serverSsr.onCleanup(() => { cleanupEffects++ @@ -2035,7 +4300,7 @@ describe('createStartHandler request cancellation', () => { resolveRender = resolve }) const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - const handler = createStartHandler(() => { + const handler = createTestStartHandler(() => { notifyRenderStarted() return renderResult }) @@ -2079,7 +4344,9 @@ describe('createStartHandler request cancellation', () => { return middlewareResult }), ] - const handler = createStartHandler(() => new Response('must not render')) + const handler = createTestStartHandler( + () => new Response('must not render'), + ) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -2119,7 +4386,7 @@ describe('createStartHandler request cancellation', () => { const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) let streamResponse!: ReturnType - const handler = createStartHandler(({ router: requestRouter }) => { + const handler = createTestStartHandler(({ router: requestRouter }) => { streamResponse = createSsrStreamResponse( requestRouter, new Response(new ReadableStream({ cancel })), @@ -2159,7 +4426,7 @@ describe('createStartHandler request cancellation', () => { return result }), ] - const handler = createStartHandler(({ router: requestRouter }) => + const handler = createTestStartHandler(({ router: requestRouter }) => createSsrStreamResponse( requestRouter, new Response( @@ -2219,7 +4486,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -2252,7 +4519,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -2285,7 +4552,7 @@ describe('createStartHandler request cancellation', () => { createMiddleware().server(() => ssrResponse as any), ] const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -2334,7 +4601,7 @@ describe('createStartHandler request cancellation', () => { createMiddleware().server(() => ssrResponse as any), ] const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -2371,7 +4638,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -2433,7 +4700,7 @@ describe('createStartHandler request cancellation', () => { ssrResponse = createSsrStreamResponse(requestRouter, response) return ssrResponse }) - const handler = createStartHandler(render) + const handler = createTestStartHandler(render) const result = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -2456,7 +4723,7 @@ describe('createStartHandler request cancellation', () => { expect(router.serverSsr).toBeUndefined() }) - it('cancels a transferred body that middleware returns after abort', async () => { + it('cancels a piped body that middleware returns after abort', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() @@ -2473,12 +4740,9 @@ describe('createStartHandler request cancellation', () => { startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { const result = await next() - const derived = transferResponseBodyOwnership( + const derived = new Response( + result.response.body!.pipeThrough(new TransformStream()), result.response, - new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ), ) derivedBody = derived.body! notifyResponseCaptured() @@ -2490,7 +4754,7 @@ describe('createStartHandler request cancellation', () => { const response = new Response( new ReadableStream({ cancel: sourceCancel }), ) - const handler = createStartHandler(({ router: requestRouter }) => + const handler = createTestStartHandler(({ router: requestRouter }) => createSsrStreamResponse(requestRouter, response), ) const result = handler( @@ -2572,9 +4836,208 @@ describe('createStartHandler inlineCss option', () => { }) it('returns a static inline CSS default only for non-callback options', () => { - expect(getStaticHandlerInlineCssDefault(undefined)).toBe(true) - expect(getStaticHandlerInlineCssDefault(true)).toBe(true) - expect(getStaticHandlerInlineCssDefault(false)).toBe(false) - expect(getStaticHandlerInlineCssDefault(() => true)).toBe(undefined) + expect(getStaticInlineCss(undefined, undefined)).toBe(true) + expect(getStaticInlineCss(undefined, true)).toBe(true) + expect(getStaticInlineCss(undefined, false)).toBe(false) + expect(getStaticInlineCss(undefined, () => true)).toBe(undefined) + expect(getStaticInlineCss(false, () => true)).toBe(false) + expect(getStaticInlineCss(true, false)).toBe(true) + }) +}) + +describe('setResponseHeaders', () => { + it('should set a single header via Headers object', async () => { + const headers = new Headers() + headers.set('X-Custom-Header', 'test-value') + + const handler = createResponseHandler(() => { + setResponseHeaders(headers) + const responseHeaders = getResponseHeaders() + expect(responseHeaders.get('X-Custom-Header')).toBe('test-value') + return new Response('OK') + }) + + const request = new Request('http://localhost:3000/test') + await handler(request, {}) + }) + + it('should set multiple headers via Headers object', async () => { + const headers = new Headers() + headers.set('X-Custom-Header', 'test-value') + headers.set('X-Another-Header', 'another-value') + headers.set('Content-Type', 'application/json') + + const handler = createResponseHandler(() => { + setResponseHeaders(headers) + const responseHeaders = getResponseHeaders() + expect(responseHeaders.get('X-Custom-Header')).toBe('test-value') + expect(responseHeaders.get('X-Another-Header')).toBe('another-value') + expect(responseHeaders.get('Content-Type')).toBe('application/json') + return new Response('OK') + }) + + const request = new Request('http://localhost:3000/test') + await handler(request, {}) + }) + + it('should handle empty Headers object', async () => { + const handler = createResponseHandler(() => { + const headers = new Headers() + setResponseHeaders(headers) + const responseHeaders = getResponseHeaders() + expect(responseHeaders).toBeDefined() + expect(Array.from(responseHeaders.entries()).length).toEqual(0) + return new Response('OK') + }) + + const request = new Request('http://localhost:3000/test') + await handler(request, {}) + }) + + it('should preserve response header values when a snapshot is passed back', async () => { + const cookies = ['session=abc123; Path=/', 'user=john; Path=/'] + const handler = createResponseHandler(() => { + setResponseHeader('set-cookie', cookies) + setResponseHeader('x-custom', 'keep') + const headers = getResponseHeaders() + const entries = Array.from(headers) + + setResponseHeaders(headers) + + expect(Array.from(getResponseHeaders())).toEqual(entries) + expect(Array.from(headers)).toEqual(entries) + expect(headers.getSetCookie()).toEqual(cookies) + return new Response('OK') + }) + + const response = await handler( + new Request('http://localhost:3000/test'), + {}, + ) + expect(response.headers.getSetCookie()).toEqual(cookies) + expect(response.headers.get('x-custom')).toBe('keep') + }) + + it('should replace existing headers with the same name', async () => { + const handler = createResponseHandler(() => { + setResponseHeaders( + new Headers({ + 'X-Custom-Header': 'old-value', + }), + ) + expect(getResponseHeader('X-Custom-Header')).toEqual('old-value') + setResponseHeaders( + new Headers({ + 'X-Custom-Header': 'new-value', + }), + ) + expect(getResponseHeader('X-Custom-Header')).toEqual('new-value') + + return new Response('OK') + }) + + const request = new Request('http://localhost:3000/test') + await handler(request, {}) + }) + + it('should handle multiple headers with the same name added via headers.append()', async () => { + const headers = new Headers() + headers.append('Set-Cookie', 'session=abc123; Path=/; HttpOnly') + headers.append('Set-Cookie', 'user=john; Path=/; Secure') + + const handler = createResponseHandler(() => { + setResponseHeaders(headers) + + // Set-Cookie values remain separate during Headers iteration. + const setCookieValue = getResponseHeader('Set-Cookie') + + expect(setCookieValue).toBeDefined() + + // Both cookie values should be present in the result + expect(setCookieValue).toContain('session=abc123') + expect(setCookieValue).toContain('user=john') + expect(getResponseHeaders().getSetCookie()).toEqual([ + 'session=abc123; Path=/; HttpOnly', + 'user=john; Path=/; Secure', + ]) + + return new Response('OK') + }) + + const request = new Request('http://localhost:3000/test') + await handler(request, {}) + }) + + it.each(['constructor', '__proto__'])( + 'should replace the %s header', + async (name) => { + const handler = createResponseHandler(() => { + setResponseHeader(name, 'old-value') + setResponseHeaders(new Headers([[name, 'new-value']])) + expect(getResponseHeader(name)).toBe('new-value') + return new Response('OK') + }) + + await handler(new Request('http://localhost:3000/test'), {}) + }, + ) + + it('should replace cookies on each call while preserving unrelated headers', async () => { + const cookies = [ + 'session=new; Expires=Wed, 21 Oct 2030 07:28:00 GMT; Path=/', + 'user=john; Path=/', + 'user=john; Path=/', + ] as const + const headers = new Headers([ + ['X-Last', 'last'], + ['Set-Cookie', cookies[0]], + ['X-First', 'first'], + ['set-cookie', cookies[1]], + ['SET-COOKIE', cookies[2]], + ]) + const handler = createResponseHandler(() => { + setResponseHeader('set-cookie', ['old=1', 'old=2']) + setResponseHeader('x-keep', 'keep') + setResponseHeaders(headers) + + expect(getResponseHeaders().getSetCookie()).toEqual(cookies) + expect(headers.getSetCookie()).toEqual(cookies) + expect(getResponseHeader('x-first')).toBe('first') + expect(getResponseHeader('x-last')).toBe('last') + expect(getResponseHeader('x-keep')).toBe('keep') + + setResponseHeaders(new Headers({ 'set-cookie': 'next=1' })) + expect(getResponseHeaders().getSetCookie()).toEqual(['next=1']) + expect(getResponseHeader('x-keep')).toBe('keep') + + setResponseHeaders(new Headers()) + expect(getResponseHeaders().getSetCookie()).toEqual(['next=1']) + return new Response('OK') + }) + + const response = await handler( + new Request('http://localhost:3000/test'), + {}, + ) + expect(response.headers.getSetCookie()).toEqual(['next=1']) + expect(response.headers.get('x-keep')).toBe('keep') + }) + + it('should replace combined values for ordinary headers', async () => { + const handler = createResponseHandler(() => { + setResponseHeader('x-custom', 'old-value') + setResponseHeaders( + new Headers([ + ['X-Custom', 'first'], + ['x-custom', 'second'], + ['x-empty', ''], + ]), + ) + expect(getResponseHeader('x-custom')).toBe('first, second') + expect(getResponseHeaders().get('x-empty')).toBe('') + return new Response('OK') + }) + + await handler(new Request('http://localhost:3000/test'), {}) }) }) diff --git a/packages/start-server-core/tests/early-hints.test.ts b/packages/start-server-core/tests/early-hints.test.ts index d56824a828..22366eba0d 100644 --- a/packages/start-server-core/tests/early-hints.test.ts +++ b/packages/start-server-core/tests/early-hints.test.ts @@ -76,18 +76,24 @@ describe('early hints', () => { }, } - expect( - collectStaticHintsFromManifest(manifest, [ - { id: '__root__' }, - { id: '/posts' }, - ] as Array), - ).toEqual([ - { href: '/assets/root.js', rel: 'modulepreload', as: 'script' }, + const hints = collectStaticHintsFromManifest(manifest, [ + { id: '__root__' }, + { id: '/posts' }, + ] as Array) + + expect(hints).toEqual([ + { + href: '/assets/root.js', + rel: 'modulepreload', + as: 'script', + fetchPriority: 'low', + }, { href: '/assets/shared.js', rel: 'modulepreload', as: 'script', crossOrigin: 'anonymous', + fetchPriority: 'low', }, { href: '/assets/root.css', @@ -95,9 +101,21 @@ describe('early hints', () => { as: 'style', crossOrigin: 'use-credentials', }, - { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, + { + href: '/assets/posts.js', + rel: 'modulepreload', + as: 'script', + fetchPriority: 'low', + }, { href: '/assets/posts.css', rel: 'preload', as: 'style' }, ]) + expect(hints.map(serializeEarlyHint)).toEqual([ + '; rel=modulepreload; as=script; fetchpriority=low', + '; rel=modulepreload; as=script; crossorigin=anonymous; fetchpriority=low', + '; rel=preload; as=style; crossorigin=use-credentials', + '; rel=modulepreload; as=script; fetchpriority=low', + '; rel=preload; as=style', + ]) }) it('skips static stylesheet hints when inline CSS is enabled', () => { @@ -120,7 +138,12 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, + { + href: '/assets/posts.js', + rel: 'modulepreload', + as: 'script', + fetchPriority: 'low', + }, ]) }) @@ -149,7 +172,12 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, + { + href: '/assets/posts.js', + rel: 'modulepreload', + as: 'script', + fetchPriority: 'low', + }, ]) }) @@ -171,12 +199,18 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { href: '/assets/posts.js', rel: 'preload', as: 'script' }, + { + href: '/assets/posts.js', + rel: 'preload', + as: 'script', + fetchPriority: 'low', + }, { href: '/assets/shared.js', rel: 'preload', as: 'script', crossOrigin: 'anonymous', + fetchPriority: 'low', }, ]) }) @@ -395,7 +429,7 @@ describe('early hints', () => { expect(events).toHaveLength(2) expect(headers.get('Link')).toBe( - '; rel=modulepreload; as=script', + '; rel=modulepreload; as=script; fetchpriority=low', ) }) diff --git a/packages/start-server-core/tests/error-entry-isolation.test.ts b/packages/start-server-core/tests/error-entry-isolation.test.ts new file mode 100644 index 0000000000..6eb2feab5e --- /dev/null +++ b/packages/start-server-core/tests/error-entry-isolation.test.ts @@ -0,0 +1,550 @@ +// @vitest-environment node + +import { afterEach, describe, expect, it, vi } from 'vitest' +import { createMiddleware } from '@tanstack/start-client-core' +import { createStartHandler } from '../src/createStartHandler' +import { + appendResponseHeader, + clearResponseHeaders, + createServerEntry, + getRequest, + getRequestHeader, + getResponseHeader, + handleStartError, + removeResponseHeader, + setCookie, + setResponseHeader, + setResponseStatus, +} from '../src/request-response' + +const startMocks = vi.hoisted(() => ({ + requestMiddleware: [] as Array, +})) + +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ + requestMiddleware: startMocks.requestMiddleware, + serializationAdapters: [], + }), + }, +})) + +vi.mock('#tanstack-router-entry', () => ({ + getRouter: () => { + throw new Error('These middleware responses do not render a router') + }, +})) + +function createHandler() { + return createStartHandler(() => new Response('unused')) +} + +function request(marker: string, method = 'GET') { + return new Request('http://localhost/', { + method, + headers: { 'x-request-marker': marker }, + }) +} + +function setRequestResponseState() { + setResponseStatus(418, 'Example Error') + setResponseHeader('x-response-marker', getRequestHeader('x-request-marker')!) +} + +afterEach(() => { + startMocks.requestMiddleware = [] +}) + +describe('generic error response finalization', () => { + it.each(['cookie', 'status', 'bodyless'] as const)( + 'includes %s helper writes made by a lazy error headers getter', + async (effect) => { + const error = Object.assign(new Error('refresh required'), { + status: 401, + }) + Object.defineProperty(error, 'headers', { + get() { + setCookie('refresh', 'value') + if (effect === 'status') { + setResponseStatus(429, 'Retry Later') + } else if (effect === 'bodyless') { + setResponseStatus(204) + } + return new Headers({ 'www-authenticate': 'Bearer' }) + }, + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + throw error + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const response = await entry.fetch(request(effect)) + + // A bodyless helper status does not describe the failure, so the + // error's own status applies. + const status = effect === 'status' ? 429 : 401 + expect(response.status).toBe(status) + expect(response.headers.get('www-authenticate')).toBe('Bearer') + expect(response.headers.getSetCookie()).toEqual(['refresh=value; Path=/']) + expect(await response.json()).toMatchObject({ + status, + statusText: effect === 'status' ? 'Retry Later' : '', + }) + }, + ) + + it('does not evaluate error statusText when a helper already supplies it', async () => { + const error = Object.assign(new Error('handled'), { status: 409 }) + const statusText = vi.fn(() => { + throw new Error('The overridden metadata must not be read') + }) + Object.defineProperty(error, 'statusText', { get: statusText }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setResponseStatus(418, 'Helper Status') + throw error + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const response = await entry.fetch(request('status text')) + + expect(statusText).not.toHaveBeenCalled() + expect(response.status).toBe(418) + expect(response.statusText).toBe('Helper Status') + expect(await response.json()).toMatchObject({ statusText: 'Helper Status' }) + }) + + it('includes synchronous helper writes made while reporting an error', async () => { + const error = new Error('reported failure') + const report = vi.spyOn(console, 'error').mockImplementation(() => { + setResponseStatus(503, 'Reported Failure') + setCookie('reported', 'yes') + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + throw error + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + try { + const response = await entry.fetch(request('reporting')) + + expect(report).toHaveBeenCalledExactlyOnceWith(error) + expect(response.status).toBe(503) + expect(response.headers.getSetCookie()).toEqual(['reported=yes; Path=/']) + expect(await response.json()).toMatchObject({ + status: 503, + statusText: 'Reported Failure', + }) + } finally { + report.mockRestore() + } + }) + + it.each(['clear', 'remove', 'empty'] as const)( + 'preserves the %s Content-Type helper operation on a generic error', + async (operation) => { + const errorHeaders = new Headers({ + 'content-type': 'application/problem+json', + }) + const error = Object.assign(new Error('private error message'), { + status: 418, + statusText: 'Teapot', + headers: errorHeaders, + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + if (operation === 'clear') { + clearResponseHeaders() + } else if (operation === 'remove') { + removeResponseHeader('content-type') + } else { + setResponseHeader('content-type', '') + } + setResponseHeader('x-response-marker', 'preserved') + throw error + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const response = await entry.fetch(request(operation)) + + expect(response.status).toBe(418) + expect(response.statusText).toBe('Teapot') + expect(response.headers.get('content-type')).toBe( + operation === 'empty' ? '' : null, + ) + expect(response.headers.get('x-response-marker')).toBe('preserved') + expect(await response.json()).toEqual({ + status: 418, + statusText: 'Teapot', + unhandled: true, + message: 'HTTPError', + }) + expect(errorHeaders.get('content-type')).toBe('application/problem+json') + }, + ) + + it('applies helper appends once when a converted error returns through middleware', async () => { + const error = Object.assign(new Error('handled'), { + status: 409, + headers: { vary: 'Accept-Encoding' }, + }) + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + expect(getResponseHeader('vary')).toBe( + 'Accept-Encoding, Origin, User-Agent', + ) + return result + }), + createMiddleware().server(() => { + appendResponseHeader('vary', 'Origin') + const response = handleStartError(error) + expect(getResponseHeader('vary')).toBe('Accept-Encoding, Origin') + appendResponseHeader('vary', 'User-Agent') + return response + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const response = await entry.fetch(request('appends')) + + expect(response.headers.get('vary')).toBe( + 'Accept-Encoding, Origin, User-Agent', + ) + expect(await response.json()).toMatchObject({ status: 409 }) + }) + + it.each([204, 205, 304])( + 'ignores bodyless helper status %i for an uncaught error', + async (status) => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setResponseStatus(status) + setResponseHeader('x-response-marker', 'bodyless') + throw new Error('bodyless failure') + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + try { + const response = await entry.fetch(request('bodyless')) + + expect(response.status).toBe(500) + expect(response.headers.get('x-response-marker')).toBe('bodyless') + expect(await response.json()).toMatchObject({ status: 500 }) + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }, + ) + + it('keeps shared error headers and cookies isolated from each invocation', async () => { + const errorHeaders = new Headers([ + ['vary', 'Accept-Encoding'], + ['set-cookie', 'session=original; Path=/'], + ['set-cookie', 'independent=preserved; Path=/'], + ]) + const error = Object.assign(new Error('shared failure'), { + status: 409, + headers: errorHeaders, + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + const marker = getRequestHeader('x-request-marker')! + appendResponseHeader('vary', marker) + setCookie('session', marker, { path: '/' }) + throw error + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const responses = await Promise.all([ + entry.fetch(request('first')), + entry.fetch(request('second')), + ]) + + for (const [index, marker] of ['first', 'second'].entries()) { + const response = responses[index]! + expect(response.headers.get('vary')).toBe(`Accept-Encoding, ${marker}`) + expect(response.headers.getSetCookie()).toEqual([ + 'independent=preserved; Path=/', + `session=${marker}; Path=/`, + ]) + expect(await response.json()).toMatchObject({ status: 409 }) + } + expect(errorHeaders.get('vary')).toBe('Accept-Encoding') + expect(errorHeaders.getSetCookie()).toEqual([ + 'session=original; Path=/', + 'independent=preserved; Path=/', + ]) + }) +}) + +describe('server entry request ownership', () => { + it.each(['GET', 'HEAD'])( + 'finalizes a primitive error in the %s request context', + async (method) => { + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw 'example failure' + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const response = await entry.fetch(request('primitive', method)) + + expect(response.status).toBe(418) + expect(response.statusText).toBe('Example Error') + expect(response.headers.get('x-response-marker')).toBe('primitive') + if (method === 'HEAD') { + expect(response.body).toBeNull() + } else { + expect(await response.json()).toMatchObject({ status: 418 }) + } + }, + ) + + it('preserves the original rejection from the raw Start handler', async () => { + const error = new Error('example failure') + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw error + }), + ] + + await expect(createHandler()(request('raw'))).rejects.toBe(error) + }) + + it('removes a thrown Response body for HEAD without a helper write', async () => { + const cancel = vi.fn() + const body = new ReadableStream({ cancel }) + const entry = createServerEntry({ + fetch() { + throw new Response(body, { status: 400 }) + }, + }) + + const response = await entry.fetch(request('response failure', 'HEAD')) + + expect(response.status).toBe(400) + expect(response.body).toBeNull() + expect(cancel).toHaveBeenCalledOnce() + }) + + it.each(['handleStartError', 'rethrow'])( + 'keeps a reporting catch in the request context with %s', + async (conversion) => { + const error = new Error('example failure') + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw error + }), + ] + const handler = createHandler() + let caught: unknown + let caughtRequest: Request | undefined + const entry = createServerEntry({ + async fetch(input, opts) { + setResponseHeader('x-entry-marker', 'entry') + try { + return await handler(input, opts) + } catch (value) { + caught = value + caughtRequest = getRequest() + if (conversion === 'rethrow') { + throw value + } + return handleStartError(value) + } + }, + }) + const input = request('custom') + + const response = await entry.fetch(input) + + expect(caught).toBe(error) + expect(caughtRequest).toBe(input) + expect(response.status).toBe(418) + expect(response.headers.get('x-entry-marker')).toBe('entry') + expect(response.headers.get('x-response-marker')).toBe('custom') + }, + ) + + it('allows a custom catch to replace the response without Start helper state', async () => { + const error = new Error('example failure') + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw error + }), + ] + const handler = createHandler() + let caught: unknown + const replacement = new Response('custom response', { status: 202 }) + const entry = createServerEntry({ + async fetch(input, opts) { + try { + return await handler(input, opts) + } catch (value) { + caught = value + return replacement + } + }, + }) + + const response = await entry.fetch(request('custom replacement')) + + expect(caught).toBe(error) + expect(response).toBe(replacement) + expect(response.status).toBe(202) + expect(response.headers.get('x-response-marker')).toBeNull() + expect(await response.text()).toBe('custom response') + }) + + it('finalizes each overlapping invocation in its own context', async () => { + const error = new Error('shared example failure') + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw error + }), + ] + const handler = createHandler() + let caughtCount = 0 + let release!: () => void + const bothCaught = new Promise((resolve) => { + release = resolve + }) + const entry = createServerEntry({ + async fetch(input, opts) { + try { + return await handler(input, opts) + } catch (value) { + caughtCount++ + if (caughtCount === 2) { + release() + } + await bothCaught + return handleStartError(value) + } + }, + }) + + const responses = await Promise.all([ + entry.fetch(request('first')), + entry.fetch(request('second')), + ]) + + expect(responses.map((response) => response.status)).toEqual([418, 418]) + expect( + responses.map((response) => response.headers.get('x-response-marker')), + ).toEqual(['first', 'second']) + }) + + it.each(['return', 'throw'])( + 'does not mutate a reusable bodyless Response when middleware uses %s', + async (result) => { + const source = new Response(null, { + headers: { 'x-source-marker': 'source' }, + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setResponseHeader( + 'x-response-marker', + getRequestHeader('x-request-marker')!, + ) + if (result === 'throw') { + throw source + } + return source + }), + ] + const entry = createServerEntry({ fetch: createHandler() }) + + const first = await entry.fetch(request('first')) + const second = await entry.fetch(request('second')) + + expect(first.headers.get('x-response-marker')).toBe('first') + expect(second.headers.get('x-response-marker')).toBe('second') + expect(first.headers.get('x-source-marker')).toBe('source') + expect(second.headers.get('x-source-marker')).toBe('source') + expect(source.headers.get('x-response-marker')).toBeNull() + expect(source.headers.get('x-source-marker')).toBe('source') + }, + ) + + it('isolates overlapping top-level entry invocations that reuse the same Request', async () => { + let invocationCount = 0 + let release!: () => void + const bothStarted = new Promise((resolve) => { + release = resolve + }) + const entry = createServerEntry({ + async fetch() { + invocationCount++ + setResponseStatus(418) + setResponseHeader('x-invocation-marker', String(invocationCount)) + if (invocationCount === 2) { + release() + } + await bothStarted + throw 'example failure' + }, + }) + const input = request('shared input') + + const responses = await Promise.all([ + entry.fetch(input), + entry.fetch(input), + ]) + + expect(responses.map((response) => response.status)).toEqual([418, 418]) + expect( + responses.map((response) => response.headers.get('x-invocation-marker')), + ).toEqual(['1', '2']) + }) + + it('restores the outer request context after a nested entry handles another request', async () => { + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + setRequestResponseState() + throw 'example failure' + }), + ] + const handler = createHandler() + const inner = createServerEntry({ fetch: handler }) + let innerResponse: Response | undefined + let restoredRequest: Request | undefined + const outer = createServerEntry({ + async fetch(input, opts) { + setResponseHeader('x-outer-marker', 'outer') + innerResponse = await inner.fetch(request('inner')) + restoredRequest = getRequest() + return handler(input, opts) + }, + }) + const input = request('outer') + + const outerResponse = await outer.fetch(input) + + expect(restoredRequest).toBe(input) + expect(innerResponse?.headers.get('x-response-marker')).toBe('inner') + expect(innerResponse?.headers.get('x-outer-marker')).toBeNull() + expect(outerResponse.headers.get('x-response-marker')).toBe('outer') + expect(outerResponse.headers.get('x-outer-marker')).toBe('outer') + }) +}) diff --git a/packages/start-server-core/tests/external-sessions.test.ts b/packages/start-server-core/tests/external-sessions.test.ts new file mode 100644 index 0000000000..b4a32bb6b1 --- /dev/null +++ b/packages/start-server-core/tests/external-sessions.test.ts @@ -0,0 +1,174 @@ +// @vitest-environment node + +import { afterEach, describe, expect, it, vi } from 'vitest' +import { createMiddleware } from '@tanstack/start-client-core' +import { getIronSession } from 'iron-session' +import { createStartHandler } from '../src/createStartHandler' +import * as server from '../src/request-response' + +const startMocks = vi.hoisted(() => ({ + requestMiddleware: [] as Array, +})) +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ + requestMiddleware: startMocks.requestMiddleware, + serializationAdapters: [], + }), + }, +})) +vi.mock('#tanstack-router-entry', () => ({ + getRouter: () => { + throw new Error('The request middleware must handle the request') + }, +})) + +function handler(run: (request: Request) => Promise) { + startMocks.requestMiddleware = [ + createMiddleware().server(({ request }) => run(request)), + ] + return createStartHandler(() => { + throw new Error('The request middleware must return a response') + }) +} + +function request(cookie?: string, path = '/') { + return new Request(`https://start.example${path}`, { + headers: cookie ? { cookie } : undefined, + }) +} + +function cookies(response: Response) { + return response.headers + .getSetCookie() + .map((c) => c.split(';', 1)[0]) + .join('; ') +} + +const password = 'external-session-test-password-at-least-32-characters' +function iron(name = 'iron') { + return getIronSession<{ user?: string; visits?: number }>( + { read: server.getCookie, write: server.setCookie }, + { cookieName: name, password, ttl: 3600 }, + ) +} + +afterEach(() => { + startMocks.requestMiddleware = [] +}) + +describe('external sessions through public Start request middleware', () => { + it('leaves session ownership to the application', () => { + for (const name of [ + 'defineSession', + 'useSession', + 'getSession', + 'updateSession', + 'clearSession', + 'sealSession', + 'unsealSession', + ]) { + expect(server).not.toHaveProperty(name) + } + }) + + it('loads, saves and destroys an iron-session with the public cookie helpers', async () => { + const app = handler(async (req) => { + const session = await iron() + if (req.url.endsWith('/login')) { + session.user = 'alice' + await session.save() + } else if (req.url.endsWith('/logout')) { + session.destroy() + } + return Response.json({ user: session.user ?? null }) + }) + const anonymous = await app(request(), {}) + expect(anonymous.headers.getSetCookie()).toEqual([]) + const login = await app(request(undefined, '/login'), {}) + expect(login.headers.getSetCookie()[0]).toMatch(/HttpOnly/i) + expect(login.headers.getSetCookie()[0]).toMatch(/Secure/i) + expect(await (await app(request(cookies(login)), {})).json()).toEqual({ + user: 'alice', + }) + const logout = await app(request(cookies(login), '/logout'), {}) + expect(logout.headers.getSetCookie()[0]).toMatch(/Max-Age=0/i) + expect(await (await app(request(cookies(logout)), {})).json()).toEqual({ + user: null, + }) + }) + + it('keeps each request and each separately named iron-session independent', async () => { + const app = handler(async (req) => { + const [auth, preferences] = await Promise.all([ + iron(), + iron('preferences'), + ]) + auth.user = new URL(req.url).searchParams.get('user')! + preferences.visits = 3 + await Promise.all([auth.save(), preferences.save()]) + return Response.json({ user: auth.user }) + }) + const [alice, bob] = await Promise.all([ + app(request(undefined, '/?user=alice'), {}), + app(request(undefined, '/?user=bob'), {}), + ]) + expect(alice.headers.getSetCookie()).toHaveLength(2) + expect(bob.headers.getSetCookie()).toHaveLength(2) + const read = handler(async () => Response.json({ ...(await iron()) })) + expect(await (await read(request(cookies(alice)), {})).json()).toEqual({ + user: 'alice', + }) + expect(await (await read(request(cookies(bob)), {})).json()).toEqual({ + user: 'bob', + }) + }) + + it('keeps the last cookie write when a session is saved and then destroyed', async () => { + const app = handler(async () => { + const session = await iron() + session.user = 'alice' + await session.save() + session.destroy() + server.setCookie('other', 'value') + return new Response('logged out') + }) + const response = await app(request(), {}) + expect(response.headers.getSetCookie()).toHaveLength(2) + expect( + response.headers.getSetCookie().find((c) => c.startsWith('iron=')), + ).toMatch(/Max-Age=0/i) + }) + + it('preserves committed external cookies and response metadata on error responses', async () => { + const app = handler(async () => { + const session = await iron() + session.user = 'alice' + await session.save() + server.setResponseHeader('x-session-test', 'retained') + return new Response('validation failed', { status: 422 }) + }) + const response = await app(request(), {}) + expect(response.status).toBe(422) + expect(response.headers.get('x-session-test')).toBe('retained') + expect(response.headers.getSetCookie()).toHaveLength(1) + const read = handler(async () => Response.json({ ...(await iron()) })) + expect(await (await read(request(cookies(response)), {})).json()).toEqual({ + user: 'alice', + }) + }) + + it('preserves a committed cookie through the default thrown-error conversion', async () => { + const app = handler(async () => { + const session = await iron() + session.visits = 1 + await session.save() + throw new Error('application failure') + }) + const response = await server + .createServerEntry({ fetch: app }) + .fetch(request(), {}) + expect(response.status).toBe(500) + expect(response.headers.getSetCookie()).toHaveLength(1) + }) +}) diff --git a/packages/start-server-core/tests/finalManifest.test.ts b/packages/start-server-core/tests/finalManifest.test.ts index dabcb19a3d..a41f64b576 100644 --- a/packages/start-server-core/tests/finalManifest.test.ts +++ b/packages/start-server-core/tests/finalManifest.test.ts @@ -135,6 +135,51 @@ describe('final manifest resolver', () => { expect(transformAssets).toHaveBeenCalledTimes(1) }) + it('returns a settled cached manifest without a promise', async () => { + const getBaseManifest = vi.fn(async () => baseManifest) + const resolver = createFinalManifestResolver({ cacheCreateTransform: true }) + const request = new Request('http://localhost/') + + const first = await resolver.resolveCached({ + request, + requestInlineCss: undefined, + getBaseManifest, + }) + const second = resolver.resolveCached({ + request, + requestInlineCss: undefined, + getBaseManifest, + }) + + expect(second).toBe(first) + expect(getBaseManifest).toHaveBeenCalledTimes(1) + }) + + it('resolves each request when inline CSS is decided per request', async () => { + const getBaseManifest = vi.fn(async () => baseManifest) + const inlineCss = vi.fn(() => false) + const resolver = createFinalManifestResolver({ + cacheCreateTransform: true, + inlineCss, + }) + const request = new Request('http://localhost/') + + const first = await resolver.resolveCached({ + request, + requestInlineCss: undefined, + getBaseManifest, + }) + const second = resolver.resolveCached({ + request, + requestInlineCss: undefined, + getBaseManifest, + }) + + expect(second).toBeInstanceOf(Promise) + await expect(second).resolves.toBe(first) + expect(inlineCss).toHaveBeenCalledTimes(2) + }) + it('does not warm up when the inline CSS default is request-dependent', () => { const getBaseManifest = vi.fn(async () => baseManifest) const transformAssets: TransformAssetsFn = ({ url }) => url diff --git a/packages/start-server-core/tests/header-contracts.test-d.ts b/packages/start-server-core/tests/header-contracts.test-d.ts new file mode 100644 index 0000000000..6db9aaef5e --- /dev/null +++ b/packages/start-server-core/tests/header-contracts.test-d.ts @@ -0,0 +1,70 @@ +import { expectTypeOf, test } from 'vitest' +import { + createServerEntry, + getResponseHeaders, + setResponseHeaders, +} from '../src/request-response' +import type { ReadonlyResponseHeaders } from '../src/request-response' +import type { RequestHandler } from '../src/request-handler' + +function checkSnapshot(headers: ReturnType) { + expectTypeOf(headers).toEqualTypeOf() + expectTypeOf(headers.get('content-type')).toExtend() + expectTypeOf(headers.getSetCookie()).toEqualTypeOf>() + expectTypeOf(Array.from(headers)).toEqualTypeOf>() + setResponseHeaders(headers) + + // @ts-expect-error A snapshot cannot change outgoing response headers. + headers.set('vary', 'Origin') + // @ts-expect-error Use appendResponseHeader for outgoing appends. + headers.append('vary', 'Origin') + // @ts-expect-error Use removeResponseHeader for outgoing removals. + headers.delete('vary') + + headers.forEach((_value, _name, parent) => { + expectTypeOf(parent).toEqualTypeOf() + // @ts-expect-error The callback does not expose mutable outgoing headers. + parent.set('vary', 'Origin') + }) +} + +test('response header snapshots expose read methods and explicit copy-back', () => { + expectTypeOf(checkSnapshot).toBeFunction() +}) + +type RequiredContextRegister = { + server: { requestContext: { tenantId: string } } +} + +function checkRequiredEntryContext( + handler: RequestHandler, + request: Request, +) { + const entry = createServerEntry({ fetch: handler }) + expectTypeOf(entry.fetch).toEqualTypeOf< + RequestHandler + >() + entry.fetch(request, { context: { tenantId: 'example' } }) + // @ts-expect-error The wrapped handler still requires request options. + entry.fetch(request) + // @ts-expect-error The wrapped handler still requires its request context. + entry.fetch(request, {}) + // @ts-expect-error The wrapped handler still requires the tenant identifier. + entry.fetch(request, { context: {} }) +} + +function checkOptionalEntryContext( + handler: RequestHandler, + request: Request, +) { + const entry = createServerEntry({ fetch: handler }) + expectTypeOf(entry.fetch).toEqualTypeOf>() + entry.fetch(request) + entry.fetch(request, {}) + entry.fetch(request, { context: { nonce: 'example' } }) +} + +test('server entries preserve inferred required and optional request context', () => { + expectTypeOf(checkRequiredEntryContext).toBeFunction() + expectTypeOf(checkOptionalEntryContext).toBeFunction() +}) diff --git a/packages/start-server-core/tests/header-contracts.test.ts b/packages/start-server-core/tests/header-contracts.test.ts new file mode 100644 index 0000000000..446ff084b3 --- /dev/null +++ b/packages/start-server-core/tests/header-contracts.test.ts @@ -0,0 +1,547 @@ +// @vitest-environment node + +import { afterEach, describe, expect, it, vi } from 'vitest' +import { createMiddleware } from '@tanstack/start-client-core' +import { createStartHandler } from '../src/createStartHandler' +import { + appendResponseHeader, + clearResponseHeaders, + getRequestHost, + getRequestUrl, + getResponseHeader, + getResponseHeaders, + getResponseStatus, + removeResponseHeader, + setCookie, + setResponseHeader, + setResponseStatus, +} from '../src/request-response' +import type { AnyRequestMiddleware } from '@tanstack/start-client-core' + +const startMocks = vi.hoisted(() => ({ + requestMiddleware: [] as Array, +})) +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ + requestMiddleware: startMocks.requestMiddleware, + serializationAdapters: [], + }), + }, +})) +vi.mock('#tanstack-router-entry', () => ({ + getRouter: () => { + throw new Error('The request middleware must handle the request') + }, +})) + +function handler(...middleware: Array) { + startMocks.requestMiddleware = middleware + return createStartHandler(() => { + throw new Error('The request middleware must return a response') + }) +} + +function returnedHeader(value = 'Accept-Encoding') { + return createMiddleware().server(() => { + return new Response(null, { headers: { vary: value } }) + }) +} + +afterEach(() => { + startMocks.requestMiddleware = [] +}) + +describe('response helpers through public Start request middleware', () => { + it('keeps append intent when an invalid replacement value is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + expect(() => setResponseHeader('vary', 'invalid\r\nvalue')).toThrow( + TypeError, + ) + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe('Accept-Encoding, Origin') + }) + + it('keeps removal intent when an invalid replacement value is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + removeResponseHeader('vary') + expect(() => setResponseHeader('vary', 'invalid\r\nvalue')).toThrow( + TypeError, + ) + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBeNull() + }) + + it('keeps cookie merging when an invalid replacement value is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + setCookie('helper', '1') + expect(() => + setResponseHeader('set-cookie', 'invalid\r\nvalue'), + ).toThrow(TypeError) + return next() + }), + createMiddleware().server(() => { + return new Response(null, { + headers: { 'set-cookie': 'returned=2; Path=/' }, + }) + }), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.getSetCookie()).toEqual([ + 'returned=2; Path=/', + 'helper=1; Path=/', + ]) + }) + + it('keeps an earlier cookie when an invalid serialized-cookie append is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + appendResponseHeader('set-cookie', 'helper=1; Path=/') + expect(() => + appendResponseHeader('set-cookie', 'helper=invalid\r\nvalue; Path=/'), + ).toThrow(TypeError) + return next() + }), + createMiddleware().server(() => { + return new Response(null, { + headers: { 'set-cookie': 'returned=2; Path=/' }, + }) + }), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.getSetCookie()).toEqual([ + 'returned=2; Path=/', + 'helper=1; Path=/', + ]) + }) + + it('keeps cookie removal when an invalid serialized-cookie append is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + removeResponseHeader('set-cookie') + expect(() => + appendResponseHeader('set-cookie', 'helper=invalid\r\nvalue; Path=/'), + ).toThrow(TypeError) + return next() + }), + createMiddleware().server(() => { + return new Response(null, { + headers: { 'set-cookie': 'returned=2; Path=/' }, + }) + }), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.getSetCookie()).toEqual([]) + }) + + it('does not retain a removal for an invalid header name after the error is caught', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + expect(() => removeResponseHeader('invalid name')).toThrow(TypeError) + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.status).toBe(200) + expect(response.headers.get('vary')).toBe('Accept-Encoding') + }) + + it.each(['before', 'after'])( + 'appends to a returned header %s next without duplicating at outer boundaries', + async (timing) => { + const reads: Array = [] + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + reads.push(getResponseHeader('vary')) + reads.push(getResponseHeaders().get('vary')) + return result + }), + createMiddleware().server(async ({ next }) => { + if (timing === 'before') { + appendResponseHeader('vary', 'Origin') + } + const result = await next() + if (timing === 'after') { + appendResponseHeader('vary', 'Origin') + } + reads.push(getResponseHeader('vary')) + reads.push(getResponseHeaders().get('vary')) + return result + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe('Accept-Encoding, Origin') + expect(reads).toEqual(Array(4).fill('Accept-Encoding, Origin')) + }, + ) + + it('preserves direct appends and only applies newly added helper values', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + result.response.headers.append('vary', 'Accept-Language') + appendResponseHeader('vary', 'User-Agent') + expect(getResponseHeader('vary')).toBe( + 'Accept-Encoding, Origin, Accept-Language, User-Agent', + ) + return result + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe( + 'Accept-Encoding, Origin, Accept-Language, User-Agent', + ) + }) + + it('preserves helper writes when middleware pipes the response body', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + setResponseHeader('x-response-marker', 'helper') + const result = await next() + return new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ) + }), + createMiddleware().server(() => new Response('stream body')), + ) + + const response = await app(new Request('https://start.example/'), {}) + + expect(response.headers.get('x-response-marker')).toBe('helper') + expect(await response.text()).toBe('stream body') + }) + + it('applies append intent to a replacement response without copying its old base', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + await next() + return new Response(null, { headers: { vary: 'Accept-Language' } }) + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe('Accept-Language, Origin') + }) + + it('treats application copies of materialized headers as explicit replacement input', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + return new Response(null, { headers: result.response.headers }) + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe('Accept-Encoding, Origin, Origin') + }) + + it('keeps deliberate repeated values exactly once per helper append', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + appendResponseHeader('vary', 'Origin') + return result + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', ['Origin', 'Origin']) + return next() + }), + returnedHeader('Origin'), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe('Origin, Origin, Origin, Origin') + }) + + it('preserves append ownership when a status change reconstructs a response', async () => { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + setResponseStatus(201) + return result + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.status).toBe(201) + expect(response.headers.get('vary')).toBe('Accept-Encoding, Origin') + }) + + it('applies an append once when stripping a HEAD response body', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app( + new Request('https://start.example/', { method: 'HEAD' }), + {}, + ) + expect(response.body).toBeNull() + expect(response.headers.get('vary')).toBe('Accept-Encoding, Origin') + }) + + it('appends to immutable response headers once', async () => { + const app = handler( + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + createMiddleware().server(() => + Response.redirect('https://start.example/login'), + ), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.status).toBe(302) + expect(response.headers.get('vary')).toBe('Origin') + expect(response.headers.get('location')).toBe('https://start.example/login') + }) + + it.each(['set', 'remove', 'clear'])( + 'respects an explicit %s before a later append', + async (operation) => { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + if (operation === 'set') { + setResponseHeader('vary', 'User-Agent') + } else if (operation === 'remove') { + removeResponseHeader('vary') + } else { + clearResponseHeaders() + } + appendResponseHeader('vary', 'Accept-Language') + return result + }), + createMiddleware().server(({ next }) => { + appendResponseHeader('vary', 'Origin') + return next() + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.get('vary')).toBe( + operation === 'set' ? 'User-Agent, Accept-Language' : 'Accept-Language', + ) + }, + ) + + it.each(['remove', 'clear'])( + 'keeps an append after %s before next across outer boundaries', + async (operation) => { + const reads: Array = [] + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + reads.push(result.response.headers.get('vary')) + return result + }), + createMiddleware().server(async ({ next }) => { + if (operation === 'remove') { + removeResponseHeader('vary') + } else { + clearResponseHeaders() + } + appendResponseHeader('vary', 'Origin') + const result = await next() + reads.push(result.response.headers.get('vary')) + return result + }), + returnedHeader(), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(reads).toEqual(['Origin', 'Origin']) + expect(response.headers.get('vary')).toBe('Origin') + }, + ) + + it('reads the same merged cookie values from both response header getters', async () => { + const reads: Array = [] + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + setCookie('helper', 'new') + reads.push(getResponseHeader('set-cookie')) + reads.push(getResponseHeaders().get('set-cookie')) + return result + }), + createMiddleware().server(() => { + return new Response(null, { + headers: { + 'set-cookie': + 'returned=1; Expires=Wed, 21 Oct 2030 07:28:00 GMT; Path=/', + }, + }) + }), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(response.headers.getSetCookie()).toEqual([ + 'returned=1; Expires=Wed, 21 Oct 2030 07:28:00 GMT; Path=/', + 'helper=new; Path=/', + ]) + expect(reads).toEqual(Array(2).fill(response.headers.get('set-cookie'))) + }) + + it('reads the effective returned status before an explicit helper override', async () => { + const statuses: Array = [] + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + statuses.push(getResponseStatus()) + setResponseStatus(202) + statuses.push(getResponseStatus()) + return result + }), + createMiddleware().server(() => new Response(null, { status: 404 })), + ) + const response = await app(new Request('https://start.example/'), {}) + expect(statuses).toEqual([404, 202]) + expect(response.status).toBe(202) + }) + + it.each(['set', 'append', 'delete'] as const)( + 'warns when the getResponseHeaders() snapshot is changed with %s', + async (method) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const app = handler( + createMiddleware().server(async ({ next }) => { + const result = await next() + setCookie('helper', 'one') + const snapshot = getResponseHeaders() as unknown as Headers + expect(snapshot.getSetCookie()).toEqual([ + 'returned=1; Path=/', + 'helper=one; Path=/', + ]) + expect(warnSpy).not.toHaveBeenCalled() + if (method === 'delete') { + snapshot.delete('vary') + } else { + snapshot[method]('x-snapshot', 'changed') + } + expect(warnSpy).toHaveBeenCalledOnce() + expect(warnSpy.mock.calls[0]![0]).toContain( + `getResponseHeaders().${method}()`, + ) + return result + }), + createMiddleware().server(() => { + return new Response(null, { + headers: [ + ['vary', 'Accept-Encoding'], + ['set-cookie', 'returned=1; Path=/'], + ], + }) + }), + ) + + const response = await app(new Request('https://start.example/'), {}) + + expect(response.headers.get('x-snapshot')).toBeNull() + expect(response.headers.get('vary')).toBe('Accept-Encoding') + } finally { + warnSpy.mockRestore() + } + }, + ) + + it('does not warn about getResponseHeaders() snapshot changes in production', async () => { + vi.stubEnv('NODE_ENV', 'production') + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const app = handler( + createMiddleware().server(() => { + const snapshot = getResponseHeaders() as unknown as Headers + snapshot.set('x-snapshot', 'changed') + return new Response('ok') + }), + ) + + const response = await app(new Request('https://start.example/'), {}) + + expect(response.headers.get('x-snapshot')).toBeNull() + expect(warnSpy).not.toHaveBeenCalled() + } finally { + warnSpy.mockRestore() + vi.unstubAllEnvs() + } + }) +}) + +describe('forwarded request URL helpers', () => { + it.each([ + ['https://start.example:8443/path?search=1', {}], + ['https://[::1]:8443/path?search=1', { 'x-forwarded-host': '' }], + ])( + 'keeps the request URL host when proxy and Host headers are absent: %s', + async (url, headers) => { + const app = handler( + createMiddleware().server(() => + Response.json({ + host: getRequestHost({ xForwardedHost: true }), + url: getRequestUrl({ xForwardedHost: true }).href, + }), + ), + ) + const response = await app(new Request(url, { headers }), {}) + expect(await response.json()).toEqual({ host: new URL(url).host, url }) + }, + ) + + it('uses the first forwarded host and drops an internal port when no external port is provided', async () => { + const app = handler( + createMiddleware().server(() => + Response.json({ + url: getRequestUrl({ xForwardedHost: true }).href, + }), + ), + ) + const response = await app( + new Request('http://internal.example:3000/path', { + headers: { + host: 'origin.example:4000', + 'x-forwarded-host': 'public.example, proxy.example', + 'x-forwarded-proto': 'https', + }, + }), + {}, + ) + expect(await response.json()).toEqual({ + url: 'https://public.example/path', + }) + }) +}) diff --git a/packages/start-server-core/tests/redirect-protocol-reconciliation.test.ts b/packages/start-server-core/tests/redirect-protocol-reconciliation.test.ts new file mode 100644 index 0000000000..95c5f2fa23 --- /dev/null +++ b/packages/start-server-core/tests/redirect-protocol-reconciliation.test.ts @@ -0,0 +1,664 @@ +// @vitest-environment node + +import { afterAll, afterEach, describe, expect, it, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { + BaseRootRoute, + BaseRoute, + RawStream, + RouterCore, + createNonReactiveMutableStore, + createNonReactiveReadonlyStore, + isRedirect, + notFound, + redirect, +} from '@tanstack/router-core' +import { createMiddleware } from '@tanstack/start-client-core' +import { serverFnFetcher } from '../../start-client-core/dist/esm/client-rpc/serverFnFetcher.js' +import { createStartHandler } from '../src/createStartHandler' +import { + appendResponseHeader, + clearResponseHeaders, + removeResponseHeader, + getResponseHeader, + setCookie, + setResponseHeader, + setResponseStatus, +} from '../src/request-response' + +const mocks = vi.hoisted(() => { + const previousServerFnBase = process.env.TSS_SERVER_FN_BASE + process.env.TSS_SERVER_FN_BASE = '/_serverFn/' + return { + previousServerFnBase, + middleware: [] as Array, + action: undefined as undefined | (() => unknown), + } +}) + +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ + requestMiddleware: mocks.middleware, + serializationAdapters: [], + }), + }, +})) +vi.mock('#tanstack-router-entry', () => ({ + getRouter: () => makeRouter(), +})) +vi.mock('#tanstack-start-server-fn-resolver', () => ({ + getServerFnById: () => mocks.action, +})) +// This test runs the client decoder in Node without the compiler's browser +// replacement for the isomorphic Start-options accessor. +vi.mock('../../start-client-core/dist/esm/getStartOptions.js', () => ({ + getStartOptions: () => undefined, +})) + +function makeRouter() { + const root = new BaseRootRoute({}) + const index = new BaseRoute({ + getParentRoute: () => root, + path: '/', + component: () => null, + }) + return new RouterCore( + { + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: root.addChildren([index]), + isServer: true, + }, + () => ({ + createMutableStore: createNonReactiveMutableStore, + createReadonlyStore: createNonReactiveReadonlyStore, + batch: (fn: () => void) => fn(), + }), + ) +} + +function app() { + return createStartHandler(() => { + throw new Error('This request should not render HTML') + }) +} + +async function callServerFn() { + const handler = app() + return serverFnFetcher( + '/_serverFn/test', + [{ method: 'GET' }], + async (url: string, init: RequestInit) => + handler(new Request(new URL(url, 'https://start.example'), init), {}), + ) +} + +afterEach(() => { + mocks.middleware = [] + mocks.action = undefined +}) + +afterAll(() => { + if (mocks.previousServerFnBase === undefined) { + Reflect.deleteProperty(process.env, 'TSS_SERVER_FN_BASE') + } else { + process.env.TSS_SERVER_FN_BASE = mocks.previousServerFnBase + } +}) + +describe('Router redirects through public request middleware', () => { + it.each([ + { target: 'to', throws: false, status: 302, statusText: undefined }, + { target: 'to', throws: true, status: 302, statusText: undefined }, + { target: 'to', throws: false, status: 307, statusText: 'Continue' }, + { target: 'to', throws: true, status: 307, statusText: 'Continue' }, + { target: 'href', throws: false, status: 302, statusText: undefined }, + { target: 'href', throws: true, status: 307, statusText: 'Continue' }, + ] as const)( + 'resolves $target redirects with throws=$throws and helper status $status/$statusText', + async ({ target, throws, status, statusText }) => { + mocks.middleware = [ + createMiddleware().server(() => { + setResponseStatus(status, statusText) + setCookie('session', 'committed') + const response = redirect({ [target]: '/login' }) + if (throws) { + throw response + } + return response + }), + ] + + const response = await app()(new Request('https://start.example'), {}) + + expect(response.status).toBe(status) + if (statusText !== undefined) { + expect(response.statusText).toBe(statusText) + } + expect(response.headers.get('location')).toBe('/login') + expect(response.headers.getSetCookie()).toEqual([ + 'session=committed; Path=/', + ]) + }, + ) + + it.each([false, true])( + 'keeps the server-function redirect envelope when throws=%s and helper status changes', + async (throws) => { + mocks.middleware = [ + createMiddleware().server(({ next }) => { + setResponseStatus(302, 'Continue') + return next() + }), + ] + mocks.action = () => { + const response = redirect({ to: '/login', statusCode: 303 }) + if (throws) { + throw response + } + return { result: response } + } + + await expect(callServerFn()).rejects.toSatisfy((value: unknown) => { + return ( + isRedirect(value) && + value.options.href === '/login' && + value.status === 303 + ) + }) + }, + ) +}) + +const mutations = [ + { + name: 'a different content type', + run: () => setResponseHeader('content-type', 'text/plain'), + }, + { name: 'cleared headers', run: () => clearResponseHeaders() }, + { + name: 'the raw response marker', + run: () => setResponseHeader('x-tss-raw', 'true'), + }, + { + name: 'the serialized marker', + run: () => setResponseHeader('x-tss-serialized', 'true'), + }, +] + +describe('server-function protocol headers through public request middleware', () => { + it.each(['constructor', 'toString', '__proto__'])( + 'allows helpers to write and clear the %s header on protocol responses', + async (name) => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + expect(result.response.headers.get(name)).toBe('from-helper') + expect(getResponseHeader(name)).toBe('from-helper') + clearResponseHeaders() + expect(getResponseHeader(name)).toBeUndefined() + return result + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + setResponseHeader(name, 'from-helper') + expect(getResponseHeader(name)).toBe('from-helper') + return result + }), + ] + mocks.action = () => ({ + result: new Response('raw result', { + headers: [[name, 'from-response']], + }), + }) + + const response = await callServerFn() + expect(response).toBeInstanceOf(Response) + expect(response.headers.get(name)).toBeNull() + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(await response.text()).toBe('raw result') + }, + ) + + it('restores direct protocol header mutations as the response leaves the pipeline', async () => { + const mutateHeaders = (response: Response) => { + response.headers.set('content-type', 'text/plain') + response.headers.delete('x-tss-serialized') + response.headers.append('x-tss-raw', 'true') + } + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + // Outer middleware sees an inner middleware's direct change until + // Start sends the response. + expect(result.response.headers.get('content-type')).toBe('text/plain') + expect(result.response.headers.get('x-tss-serialized')).toBeNull() + mutateHeaders(result.response) + return result + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + mutateHeaders(result.response) + return result + }), + ] + mocks.action = () => ({ result: { answer: 42 } }) + + await expect(callServerFn()).resolves.toEqual({ result: { answer: 42 } }) + }) + + it('restores a raw response marker directly removed by middleware as the response leaves the pipeline', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + expect(result.response.headers.get('x-tss-raw')).toBeNull() + result.response.headers.delete('x-tss-raw') + return result + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + result.response.headers.delete('x-tss-raw') + return result + }), + ] + mocks.action = () => ({ result: new Response('raw result') }) + + const response = await callServerFn() + expect(response).toBeInstanceOf(Response) + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(await response.text()).toBe('raw result') + }) + + it('wraps raw responses without changing their headers or duplicating their body', async () => { + const cancel = vi.fn() + const source = new Response(new ReadableStream({ cancel }), { + status: 201, + statusText: 'Created', + headers: [ + ['content-type', 'application/octet-stream'], + ['set-cookie', 'session=one; Path=/'], + ['set-cookie', 'session=two; Path=/admin'], + ], + }) + mocks.action = () => ({ result: source }) + + const response = await callServerFn() + expect(response).toBeInstanceOf(Response) + expect(response).not.toBe(source) + expect(response.body).toBe(source.body) + expect(response.status).toBe(201) + expect(response.statusText).toBe('Created') + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(source.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.getSetCookie()).toEqual([ + 'session=one; Path=/', + 'session=two; Path=/admin', + ]) + response.headers.set('content-type', 'text/plain') + expect(source.headers.get('content-type')).toBe('application/octet-stream') + + const reason = new Error('client disconnected') + await response.body!.cancel(reason) + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + }) + + it('marks raw responses with immutable headers without modifying their source', async () => { + const source = Response.redirect('https://start.example/login', 303) + mocks.action = () => ({ result: source }) + + const response = await callServerFn() + + expect(response).toBeInstanceOf(Response) + expect(response.status).toBe(303) + expect(response.body).toBeNull() + expect(response.headers.get('location')).toBe('https://start.example/login') + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(source.headers.get('x-tss-raw')).toBeNull() + }) + + it('keeps Location absent from RPC redirect JSON despite a helper override', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + setResponseStatus(302) + setResponseHeader('location', '/middleware-target') + return result + }), + ] + mocks.action = () => ({ result: redirect({ href: '/login' }) }) + + const response = await app()( + new Request('https://start.example/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(302) + expect(response.headers.get('location')).toBeNull() + expect(await response.json()).toMatchObject({ + href: '/login', + isSerializedRedirect: true, + }) + }) + + it.each(mutations)( + 'decodes redirects despite $name before or after next()', + async ({ run }) => { + for (const afterNext of [false, true]) { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + if (!afterNext) { + run() + } + const result = await next() + if (afterNext) { + run() + } + return result + }), + ] + mocks.action = () => ({ result: redirect({ href: '/login' }) }) + + await expect(callServerFn()).rejects.toSatisfy((value: unknown) => { + return isRedirect(value) && value.options.href === '/login' + }) + } + }, + ) + + it.each(mutations)( + 'decodes serialized values despite $name', + async ({ run }) => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + run() + return result + }), + ] + mocks.action = () => ({ result: { answer: 42 } }) + + await expect(callServerFn()).resolves.toEqual({ + result: { answer: 42 }, + }) + }, + ) + + // Setting the serialized marker cannot break a serialized reply, so that + // mutation would pass without the protection this test covers. + it.each(mutations.filter(({ name }) => name !== 'the serialized marker'))( + 'decodes serialized values wrapped in a same-body response despite $name', + async ({ run }) => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + run() + return result + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + // An ordinary wrapper that keeps the body stream and response init. + return new Response(result.response.body, result.response) + }), + ] + mocks.action = () => ({ result: { answer: 42 } }) + + await expect(callServerFn()).resolves.toEqual({ + result: { answer: 42 }, + }) + }, + ) + + it('keeps a raw result raw when a same-body wrapper loses its marker', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + removeResponseHeader('x-tss-raw') + return result + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + const headers = new Headers(result.response.headers) + headers.delete('x-tss-raw') + return new Response(result.response.body, { + status: result.response.status, + headers, + }) + }), + ] + mocks.action = () => ({ result: new Response('raw result') }) + + const response = await callServerFn() + expect(response).toBeInstanceOf(Response) + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(await response.text()).toBe('raw result') + }) + + it('decodes framed RawStream results despite a raw response marker', async () => { + mocks.middleware = [ + createMiddleware().server(({ next }) => { + setResponseHeader('x-tss-raw', 'true') + return next() + }), + ] + mocks.action = () => ({ + result: new RawStream( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('stream result')) + controller.close() + }, + }), + ), + }) + + const decoded = await callServerFn() + expect(decoded).not.toBeInstanceOf(Response) + expect(await new Response(decoded.result).text()).toBe('stream result') + }) + + it('decodes action errors despite a raw response marker', async () => { + mocks.middleware = [ + createMiddleware().server(({ next }) => { + setResponseHeader('x-tss-raw', 'true') + return next() + }), + ] + mocks.action = () => { + setResponseStatus(409) + throw new Error('Session update conflict') + } + + await expect(callServerFn()).resolves.toEqual({ + error: new Error('Session update conflict'), + }) + }) + + it('decodes not-found results despite a raw response marker', async () => { + mocks.middleware = [ + createMiddleware().server(({ next }) => { + setResponseHeader('x-tss-raw', 'true') + return next() + }), + ] + mocks.action = () => { + throw notFound({ data: 'missing' }) + } + + await expect(callServerFn()).rejects.toMatchObject({ + isNotFound: true, + data: 'missing', + }) + }) + + it('owns protocol markers supplied in redirect headers', async () => { + mocks.action = () => ({ + result: redirect({ + href: '/login', + headers: { 'x-tss-raw': 'true', 'x-tss-serialized': 'true' }, + }), + }) + + await expect(callServerFn()).rejects.toSatisfy((value: unknown) => { + return isRedirect(value) && value.options.href === '/login' + }) + }) + + it('owns protocol markers supplied in error headers', async () => { + mocks.action = () => { + throw Object.assign(new Error('Session update conflict'), { + status: 409, + headers: { 'x-tss-raw': 'true' }, + }) + } + + await expect(callServerFn()).resolves.toEqual({ + error: new Error('Session update conflict'), + }) + }) + + it('owns protocol markers supplied in not-found headers', async () => { + mocks.action = () => { + throw notFound({ + data: 'missing', + headers: { 'x-tss-raw': 'true', 'x-tss-serialized': 'true' }, + }) + } + + await expect(callServerFn()).rejects.toMatchObject({ + isNotFound: true, + data: 'missing', + }) + }) + + it('keeps an explicitly returned response raw after middleware clears headers', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + clearResponseHeaders() + setResponseHeader('x-tss-serialized', 'true') + return result + }), + ] + mocks.action = () => ({ result: new Response('raw result') }) + + const response = await callServerFn() + expect(response).toBeInstanceOf(Response) + expect(await response.text()).toBe('raw result') + }) +}) + +it('preserves protocol requirements when request middleware rejects a HEAD RPC', async () => { + mocks.middleware = [ + createMiddleware().server(() => { + setResponseHeader('content-type', 'text/plain') + setResponseHeader('x-tss-raw', 'true') + appendResponseHeader('vary', 'Origin') + throw Object.assign(new Error('HEAD request rejected'), { status: 401 }) + }), + ] + const response = await app()( + new Request('https://start.example/_serverFn/test', { + method: 'HEAD', + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + expect(response.status).toBe(401) + expect(response.body).toBeNull() + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('vary')).toBe('Origin') +}) + +it('unwinds aborted request middleware error serialization', async () => { + let resolvePending!: () => void + const pending = new Promise((resolve) => { + resolvePending = resolve + }) + let serializationStarted!: () => void + const started = new Promise((resolve) => { + serializationStarted = resolve + }) + const failure = { + status: 500, + get pending() { + serializationStarted() + return pending + }, + } + mocks.middleware = [ + createMiddleware().server(() => { + throw failure + }), + ] + const controller = new AbortController() + const reason = new Error('request disconnected') + let outcome: { response: Response } | { error: unknown } | undefined + const request = app()( + new Request('https://start.example/_serverFn/test', { + signal: controller.signal, + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + const settled = Promise.resolve(request).then( + (response) => { + outcome = { response } + }, + (error) => { + outcome = { error } + }, + ) + + await started + controller.abort(reason) + try { + // Abort propagation is promise work. Drain this turn without imposing a + // timing deadline or resolving the application-owned pending value. + await new Promise((resolve) => setImmediate(resolve)) + expect(outcome).toEqual({ error: reason }) + } finally { + resolvePending() + await settled + } +}) + +it('keeps RPC protocol metadata through a same-body wrapper', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + setResponseHeader('content-type', 'text/plain') + const result = await next() + return new Response(result.response.body, result.response) + }), + ] + mocks.action = () => ({ result: 'still serialized' }) + + await expect(callServerFn()).resolves.toEqual({ result: 'still serialized' }) +}) + +it('applies helper appends to the fresh headers of a same-body wrapper', async () => { + mocks.middleware = [ + createMiddleware().server(async ({ next }) => { + appendResponseHeader('vary', 'Origin') + const result = await next() + return new Response(result.response.body, { + headers: { vary: 'Accept-Language' }, + }) + }), + ] + mocks.action = () => ({ result: 'still serialized' }) + + const response = await app()( + new Request('https://start.example/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + expect(response.headers.get('vary')).toBe('Accept-Language, Origin') + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + await response.body?.cancel() +}) diff --git a/packages/start-server-core/tests/request-response.test.ts b/packages/start-server-core/tests/request-response.test.ts index aa1d911a38..913407be36 100644 --- a/packages/start-server-core/tests/request-response.test.ts +++ b/packages/start-server-core/tests/request-response.test.ts @@ -1,205 +1,48 @@ -import { describe, expect, it } from 'vitest' -import { - getResponseHeader, - getResponseHeaders, - requestHandler, - setResponseHeader, - setResponseHeaders, -} from '../src/request-response' +import { describe, expect, it, vi } from 'vitest' +import { createServerEntry, getRequestUrl } from '../src/request-response' -describe('setResponseHeaders', () => { - it('should set a single header via Headers object', async () => { - const headers = new Headers() - headers.set('X-Custom-Header', 'test-value') +describe('server entry pathname validation', () => { + it.each([ + '/malformed/%E0%A4', + '/malformed/%80', + '/malformed/%FF', + '/malformed/%', + '/malformed/%2', + '/malformed/%GG', + ])('rejects %s before calling the entry', async (pathname) => { + const fetch = vi.fn(() => new Response('unused')) + const entry = createServerEntry({ fetch }) - const handler = requestHandler(() => { - setResponseHeaders(headers) - const responseHeaders = getResponseHeaders() - expect(responseHeaders.get('X-Custom-Header')).toBe('test-value') - return new Response('OK') - }) - - const request = new Request('http://localhost:3000/test') - await handler(request, {}) - }) - - it('should set multiple headers via Headers object', async () => { - const headers = new Headers() - headers.set('X-Custom-Header', 'test-value') - headers.set('X-Another-Header', 'another-value') - headers.set('Content-Type', 'application/json') - - const handler = requestHandler(() => { - setResponseHeaders(headers) - const responseHeaders = getResponseHeaders() - expect(responseHeaders.get('X-Custom-Header')).toBe('test-value') - expect(responseHeaders.get('X-Another-Header')).toBe('another-value') - expect(responseHeaders.get('Content-Type')).toBe('application/json') - return new Response('OK') - }) - - const request = new Request('http://localhost:3000/test') - await handler(request, {}) - }) - - it('should handle empty Headers object', async () => { - const handler = requestHandler(() => { - const headers = new Headers() - setResponseHeaders(headers) - const responseHeaders = getResponseHeaders() - expect(responseHeaders).toBeDefined() - expect(Array.from(responseHeaders.entries()).length).toEqual(0) - return new Response('OK') - }) - - const request = new Request('http://localhost:3000/test') - await handler(request, {}) - }) - - it('should preserve the live response headers when passed back to itself', async () => { - const cookies = ['session=abc123; Path=/', 'user=john; Path=/'] - const handler = requestHandler(() => { - setResponseHeader('set-cookie', cookies) - setResponseHeader('x-custom', 'keep') - const headers = getResponseHeaders() - const entries = Array.from(headers) - - setResponseHeaders(headers) - - expect(getResponseHeaders()).toBe(headers) - expect(Array.from(headers)).toEqual(entries) - expect(headers.getSetCookie()).toEqual(cookies) - return new Response('OK') - }) - - const response = await handler( - new Request('http://localhost:3000/test'), - {}, + const response = await entry.fetch( + new Request(`http://localhost${pathname}`), ) - expect(response.headers.getSetCookie()).toEqual(cookies) - expect(response.headers.get('x-custom')).toBe('keep') + + expect(response.status).toBe(400) + expect(response.statusText).toBe('Bad Request') + expect(response.body).toBeNull() + expect(fetch).not.toHaveBeenCalled() }) - it('should replace existing headers with the same name', async () => { - const handler = requestHandler(() => { - setResponseHeaders( - new Headers({ - 'X-Custom-Header': 'old-value', - }), - ) - expect(getResponseHeader('X-Custom-Header')).toEqual('old-value') - setResponseHeaders( - new Headers({ - 'X-Custom-Header': 'new-value', - }), - ) - expect(getResponseHeader('X-Custom-Header')).toEqual('new-value') - - return new Response('OK') + it.each([ + '/plain', + '/%2Fdocs', + '/%25', + '/%5Cdocs', + '/%E2%9C%93', + '/%252Fdocs', + '/%2Fdocs?searchParam=%E0%A4', + '/plain?searchParam=%GG', + ])('preserves the pathname and search of %s', async (path) => { + const fetch = vi.fn(() => { + const url = getRequestUrl() + return new Response(url.pathname + url.search) }) + const entry = createServerEntry({ fetch }) - const request = new Request('http://localhost:3000/test') - await handler(request, {}) - }) + const response = await entry.fetch(new Request(`http://localhost${path}`)) - it('should handle multiple headers with the same name added via headers.append()', async () => { - const headers = new Headers() - headers.append('Set-Cookie', 'session=abc123; Path=/; HttpOnly') - headers.append('Set-Cookie', 'user=john; Path=/; Secure') - - const handler = requestHandler(() => { - setResponseHeaders(headers) - - // Set-Cookie values remain separate during Headers iteration. - const setCookieValue = getResponseHeader('Set-Cookie') - - expect(setCookieValue).toBeDefined() - - // Both cookie values should be present in the result - expect(setCookieValue).toContain('session=abc123') - expect(setCookieValue).toContain('user=john') - expect(getResponseHeaders().getSetCookie()).toEqual([ - 'session=abc123; Path=/; HttpOnly', - 'user=john; Path=/; Secure', - ]) - - return new Response('OK') - }) - - const request = new Request('http://localhost:3000/test') - await handler(request, {}) - }) - - it.each(['constructor', '__proto__'])( - 'should replace the %s header', - async (name) => { - const handler = requestHandler(() => { - setResponseHeader(name, 'old-value') - setResponseHeaders(new Headers([[name, 'new-value']])) - expect(getResponseHeader(name)).toBe('new-value') - return new Response('OK') - }) - - await handler(new Request('http://localhost:3000/test'), {}) - }, - ) - - it('should replace cookies on each call while preserving unrelated headers', async () => { - const cookies = [ - 'session=new; Expires=Wed, 21 Oct 2030 07:28:00 GMT; Path=/', - 'user=john; Path=/', - 'user=john; Path=/', - ] as const - const headers = new Headers([ - ['X-Last', 'last'], - ['Set-Cookie', cookies[0]], - ['X-First', 'first'], - ['set-cookie', cookies[1]], - ['SET-COOKIE', cookies[2]], - ]) - const handler = requestHandler(() => { - setResponseHeader('set-cookie', ['old=1', 'old=2']) - setResponseHeader('x-keep', 'keep') - setResponseHeaders(headers) - - expect(getResponseHeaders().getSetCookie()).toEqual(cookies) - expect(headers.getSetCookie()).toEqual(cookies) - expect(getResponseHeader('x-first')).toBe('first') - expect(getResponseHeader('x-last')).toBe('last') - expect(getResponseHeader('x-keep')).toBe('keep') - - setResponseHeaders(new Headers({ 'set-cookie': 'next=1' })) - expect(getResponseHeaders().getSetCookie()).toEqual(['next=1']) - expect(getResponseHeader('x-keep')).toBe('keep') - - setResponseHeaders(new Headers()) - expect(getResponseHeaders().getSetCookie()).toEqual(['next=1']) - return new Response('OK') - }) - - const response = await handler( - new Request('http://localhost:3000/test'), - {}, - ) - expect(response.headers.getSetCookie()).toEqual(['next=1']) - expect(response.headers.get('x-keep')).toBe('keep') - }) - - it('should replace combined values for ordinary headers', async () => { - const handler = requestHandler(() => { - setResponseHeader('x-custom', 'old-value') - setResponseHeaders( - new Headers([ - ['X-Custom', 'first'], - ['x-custom', 'second'], - ['x-empty', ''], - ]), - ) - expect(getResponseHeader('x-custom')).toBe('first, second') - expect(getResponseHeaders().get('x-empty')).toBe('') - return new Response('OK') - }) - - await handler(new Request('http://localhost:3000/test'), {}) + expect(response.status).toBe(200) + await expect(response.text()).resolves.toBe(path) + expect(fetch).toHaveBeenCalledTimes(1) }) }) diff --git a/packages/start-server-core/tests/response-reconciliation.bench.md b/packages/start-server-core/tests/response-reconciliation.bench.md new file mode 100644 index 0000000000..a9a6c09172 --- /dev/null +++ b/packages/start-server-core/tests/response-reconciliation.bench.md @@ -0,0 +1,40 @@ +# Response reconciliation benchmarks + +Run this local Vitest suite separately from the historical built-app SSR +benchmarks. It does not enable CodSpeed instrumentation: + +```sh +CI=1 NX_DAEMON=false pnpm nx run @tanstack/start-server-core:test:perf --outputStyle=stream --skipRemoteCache -- --run +``` + +These cases call the public Start handler, middleware, and response helpers. Only +the compiler's virtual entry modules and server-function resolver are supplied by +the fixture. Request dispatch, CSRF, serialization, and reconciliation use their +real implementations. Workspace dependencies are built by Nx; this package's +source is loaded through its existing Vitest aliases. + +Each case runs assertions before measurement, then dispatches 160 deterministic +GET requests per batch with eight workers and drains every response body. The +cases cover unchanged protocol headers, repairs in two middleware layers, helper +set/append/cookie writes before and after `next()`, and raw responses with three +separate cookies and 0, 4, or 20 extra headers. Each raw size runs with both +unchanged and repaired protocol headers, so an optimization that scans all +headers cannot hide its cost behind the repair cases' early exit. + +Two additional cases throw the public `notFound()` error, with and without +supplied headers, through the same handler and protocol-repair middleware. The +supplied-header case reuses caller-owned headers with a normal header, incorrect +transport headers, and three cookies. Assertions before measurement check the +404 status, JSON body, transport normalization, cookie preservation, and caller +header immutability. Timed batches validate the 404 status and drain each body, +using the same request count, concurrency, and seed as the existing nine cases. + +Copy the same benchmark and config to both revisions for a comparison. Keep the +Node version, V8 flags, batch size, and case names unchanged; compare against the +unoptimized response-reconciliation branch to measure these newly introduced +mechanisms. These focused source benchmarks supplement the production SSR app +suite; they do not replace its cross-framework or CodSpeed results. + +Use `--reporter=json --outputFile=/tmp/response-baseline.json` and a separate +candidate output file to preserve both runs' timing statistics; each test case +in the JSON report carries its `benchmarks` results. diff --git a/packages/start-server-core/tests/response-reconciliation.bench.ts b/packages/start-server-core/tests/response-reconciliation.bench.ts new file mode 100644 index 0000000000..389b6af847 --- /dev/null +++ b/packages/start-server-core/tests/response-reconciliation.bench.ts @@ -0,0 +1,391 @@ +import { afterAll, describe, expect, test, vi } from 'vitest' +import { fromCrossJSON } from 'seroval' +import { notFound, redirect } from '@tanstack/router-core' +import { + createCsrfMiddleware, + createMiddleware, +} from '@tanstack/start-client-core' +import { runRequestLoop } from '../../../benchmarks/ssr/bench-utils' +import { createStartHandler } from '../src/createStartHandler' +import { + appendResponseHeader, + setCookie, + setResponseHeader, + setResponseStatus, +} from '../src/request-response' + +const fixture = vi.hoisted(() => { + const previousServerFnBase = process.env.TSS_SERVER_FN_BASE + process.env.TSS_SERVER_FN_BASE = '/_serverFn/' + return { previousServerFnBase } +}) + +// Supply the compiler's virtual entries while keeping the real request, +// server-function transport, serialization, and reconciliation implementations. +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ requestMiddleware, serializationAdapters: [] }), + }, +})) +vi.mock('#tanstack-router-entry', () => ({ + getRouter: () => { + throw new Error('Server-function requests should not create a router') + }, +})) +vi.mock('#tanstack-start-server-fn-resolver', () => ({ + getServerFnById: (id: string) => { + const action = actions.get(id) + if (!action) { + throw new Error(`Unknown benchmark function: ${id}`) + } + return action + }, +})) + +function responseMiddleware(layer: string) { + return createMiddleware().server(async ({ request, next }) => { + const helpers = request.url.includes('/serialized-helpers?') + if (helpers) { + setResponseHeader('x-helper', layer) + appendResponseHeader('x-steps', `${layer}-before`) + setCookie(layer, 'before') + } + + const result = await next() + + if (helpers) { + appendResponseHeader('x-steps', `${layer}-after`) + setCookie(layer, 'after') + } + if (request.url.includes('/raw-')) { + if (!request.url.includes('/raw-unchanged-')) { + result.response.headers.delete('x-tss-raw') + } + } else if (!request.url.includes('/serialized-unchanged?')) { + result.response.headers.set('content-type', 'text/plain') + result.response.headers.delete('x-tss-serialized') + result.response.headers.set('x-tss-raw', 'true') + } + + return result + }) +} + +const requestMiddleware = [ + createCsrfMiddleware(), + responseMiddleware('outer'), + responseMiddleware('inner'), +] +const cookies = [ + 'first=one; Path=/', + 'second=two; Path=/', + 'third=three; Path=/', +] +const result = { answer: 42, label: 'response-reconciliation' } +const scenarios = [ + { + id: 'serialized-unchanged', + name: 'serialized response with unchanged protocol headers', + extraHeaders: undefined, + action: () => ({ result }), + }, + { + id: 'serialized-repaired', + name: 'serialized response with two protocol repairs', + extraHeaders: undefined, + action: () => ({ result }), + }, + { + id: 'serialized-helpers', + name: 'serialized response with two protocol repairs and helper writes', + extraHeaders: undefined, + action: () => ({ result }), + }, + { + id: 'serialized-protected-helpers', + name: 'serialized response with two protocol repairs and only protected helper writes', + extraHeaders: undefined, + action: () => { + // These writes create helper state but cannot change the JSON transport. + // Compare with serialized-repaired to expose needless header allocation + // while preserving every established middleware path and workload. + setResponseHeader('content-type', 'text/plain') + setResponseHeader('x-tss-serialized', 'false') + setResponseHeader('x-tss-raw', 'true') + return { result } + }, + }, + ...[0, 4, 20].flatMap((extraHeaders) => + [false, true].map((repair) => ({ + id: `raw-${repair ? 'repaired' : 'unchanged'}-${extraHeaders}`, + name: `raw response with ${repair ? 'two protocol repairs' : 'unchanged protocol headers'}, ${extraHeaders} extra headers and three cookies`, + extraHeaders, + action: () => { + const headers = new Headers({ 'content-type': 'text/plain' }) + for (let index = 0; index < extraHeaders; index++) { + headers.set(`x-extra-${index}`, `value-${index}`) + } + for (const cookie of cookies) { + headers.append('set-cookie', cookie) + } + return { result: new Response('raw-response', { headers }) } + }, + })), + ), +] +const notFoundHeaders = new Headers({ + 'content-type': 'text/plain', + 'x-tss-serialized': 'true', + 'x-tss-raw': 'true', + 'x-not-found': 'preserved', +}) +for (const cookie of cookies) { + notFoundHeaders.append('set-cookie', cookie) +} +const originalNotFoundHeaders = Array.from(notFoundHeaders) +const notFoundScenarios = [ + { + id: 'not-found-without-headers', + name: 'not-found response without supplied headers', + headers: undefined, + action: () => { + throw notFound() + }, + }, + { + id: 'not-found-with-headers', + name: 'not-found response with supplied headers and three cookies', + headers: notFoundHeaders, + action: () => { + throw notFound({ headers: notFoundHeaders }) + }, + }, +] +const redirectHref = '/redirect-target' +const redirectHeaders = new Headers({ + 'content-type': 'text/plain', + 'x-tss-serialized': 'true', + 'x-tss-raw': 'true', + 'x-redirect': 'preserved', + 'x-helper': 'caller', + 'x-steps': 'source', +}) +for (const cookie of cookies) { + redirectHeaders.append('set-cookie', cookie) +} +const originalRedirectHeaders = Array.from(redirectHeaders) +const redirectScenarios = [ + { + id: 'redirect-without-helpers', + name: 'RPC href redirect without helper writes', + status: 200, + statusText: '', + headers: undefined, + action: () => { + throw redirect({ href: redirectHref }) + }, + }, + { + id: 'redirect-with-headers-and-helpers', + name: 'RPC href redirect with supplied headers, three cookies and helper writes', + status: 202, + statusText: 'Accepted', + headers: redirectHeaders, + action: () => { + // Keep these writes out of the shared middleware so the established + // eleven workloads remain unchanged. + setResponseStatus(202, 'Accepted') + setResponseHeader('x-helper', 'complete') + setResponseHeader('content-type', 'text/plain') + setResponseHeader('location', '/ignored') + setResponseHeader('x-tss-serialized', 'true') + setResponseHeader('x-tss-raw', 'true') + appendResponseHeader('x-steps', 'before') + appendResponseHeader('x-steps', 'after') + setCookie('first', 'updated') + setCookie('helper', 'added') + throw redirect({ href: redirectHref, headers: redirectHeaders }) + }, + }, +] +const actions = new Map( + [...scenarios, ...notFoundScenarios, ...redirectScenarios].map((scenario) => [ + scenario.id, + scenario.action, + ]), +) + +const fetch = createStartHandler(() => { + throw new Error('Server-function requests should not render HTML') +}) +const handler = { fetch: (request: Request) => fetch(request, {}) } +const requestHeaders = { + 'x-tsr-serverFn': 'true', + 'sec-fetch-site': 'same-origin', + accept: 'application/json', +} + +function requestFor(id: string, sample: number) { + return new Request(`http://localhost/_serverFn/${id}?sample=${sample}`, { + headers: requestHeaders, + }) +} + +// Assertions run once before timed batches. The hot loops only dispatch and +// drain responses; they never decode JSON or run assertion-library matchers. +for (const scenario of scenarios) { + const response = await handler.fetch(requestFor(scenario.id, 0)) + expect(response.status).toBe(200) + if (scenario.extraHeaders === undefined) { + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(fromCrossJSON(await response.json(), {})).toEqual({ result }) + if (scenario.id === 'serialized-helpers') { + expect(response.headers.get('x-helper')).toBe('inner') + expect(response.headers.get('x-steps')).toBe( + 'outer-before, inner-before, inner-after, outer-after', + ) + expect(response.headers.getSetCookie().sort()).toEqual([ + 'inner=after; Path=/', + 'outer=after; Path=/', + ]) + } + } else { + expect(response.headers.get('content-type')).toBe('text/plain') + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(response.headers.get('x-tss-serialized')).toBeNull() + expect(response.headers.getSetCookie()).toEqual(cookies) + for (let index = 0; index < scenario.extraHeaders; index++) { + expect(response.headers.get(`x-extra-${index}`)).toBe(`value-${index}`) + } + expect(await response.text()).toBe('raw-response') + } +} + +for (const scenario of notFoundScenarios) { + const response = await handler.fetch(requestFor(scenario.id, 0)) + expect(response.status).toBe(404) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBeNull() + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('x-not-found')).toBe( + scenario.headers ? 'preserved' : null, + ) + expect(response.headers.getSetCookie()).toEqual( + scenario.headers ? cookies : [], + ) + expect(Array.from(notFoundHeaders)).toEqual(originalNotFoundHeaders) + expect(await response.json()).toEqual({ isNotFound: true }) +} + +for (const scenario of redirectScenarios) { + const response = await handler.fetch(requestFor(scenario.id, 0)) + expect(response.status).toBe(scenario.status) + expect(response.statusText).toBe(scenario.statusText) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('location')).toBeNull() + expect(response.headers.get('x-tss-serialized')).toBeNull() + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('x-redirect')).toBe( + scenario.headers ? 'preserved' : null, + ) + expect(response.headers.get('x-helper')).toBe( + scenario.headers ? 'complete' : null, + ) + expect(response.headers.get('x-steps')).toBe( + scenario.headers ? 'source, before, after' : null, + ) + expect(response.headers.getSetCookie()).toEqual( + scenario.headers + ? [ + 'second=two; Path=/', + 'third=three; Path=/', + 'first=updated; Path=/', + 'helper=added; Path=/', + ] + : [], + ) + expect(Array.from(redirectHeaders)).toEqual(originalRedirectHeaders) + expect(await response.json()).toEqual({ + href: redirectHref, + statusCode: 307, + isSerializedRedirect: true, + }) +} + +function validateNotFoundResponse(response: Response) { + if (response.status !== 404) { + throw new Error(`Expected not-found response, received ${response.status}`) + } +} + +afterAll(() => { + if (fixture.previousServerFnBase === undefined) { + Reflect.deleteProperty(process.env, 'TSS_SERVER_FN_BASE') + } else { + process.env.TSS_SERVER_FN_BASE = fixture.previousServerFnBase + } +}) + +describe('response reconciliation', () => { + for (const scenario of scenarios) { + test(scenario.name, async ({ bench }) => { + await bench(scenario.name, () => + runRequestLoop(handler, { + seed: 0xdecafbad, + concurrency: 8, + totalRequests: 160, + buildRequest: (random) => + requestFor(scenario.id, Math.floor(random() * 1_000_000)), + }), + ).run({ + warmupIterations: 100, + time: 5_000, + throws: true, + }) + }) + } + for (const scenario of notFoundScenarios) { + test(scenario.name, async ({ bench }) => { + await bench(scenario.name, () => + runRequestLoop(handler, { + seed: 0xdecafbad, + concurrency: 8, + totalRequests: 160, + buildRequest: (random) => + requestFor(scenario.id, Math.floor(random() * 1_000_000)), + validateResponse: validateNotFoundResponse, + }), + ).run({ + warmupIterations: 100, + time: 5_000, + throws: true, + }) + }) + } + for (const scenario of redirectScenarios) { + test(scenario.name, async ({ bench }) => { + await bench(scenario.name, () => + runRequestLoop(handler, { + seed: 0xdecafbad, + concurrency: 8, + totalRequests: 160, + buildRequest: (random) => + requestFor(scenario.id, Math.floor(random() * 1_000_000)), + validateResponse: (response) => { + if (response.status !== scenario.status) { + throw new Error( + `Expected redirect envelope status ${scenario.status}, received ${response.status}`, + ) + } + }, + }), + ).run({ + warmupIterations: 100, + time: 5_000, + throws: true, + }) + }) + } +}) diff --git a/packages/start-server-core/tests/server-functions-handler.test.ts b/packages/start-server-core/tests/server-functions-handler.test.ts index 011a222caa..434a06efca 100644 --- a/packages/start-server-core/tests/server-functions-handler.test.ts +++ b/packages/start-server-core/tests/server-functions-handler.test.ts @@ -14,22 +14,22 @@ import { } from '@tanstack/start-client-core/client-rpc' import { RawStream } from '@tanstack/router-core' import { defaultSerovalDeserializerPlugins } from '@tanstack/router-core/ssr/server' -import { handleServerAction } from '../src/server-functions-handler' +import { + DeferredResponse, + handleServerAction, +} from '../src/server-functions-handler' +import { createServerEntry, setResponseStatus } from '../src/request-response' +import { getStartEvent } from '../src/internal-request-response' import type * as StartClientCore from '@tanstack/start-client-core' const mocks = vi.hoisted(() => ({ action: vi.fn(), - response: { status: 200, statusText: 'OK' }, })) vi.mock('../src/getServerFnById', () => ({ getServerFnById: () => mocks.action, })) -vi.mock('../src/request-response', () => ({ - getResponse: () => mocks.response, -})) - vi.mock('@tanstack/start-client-core', async (importOriginal) => { const actual = await importOriginal() const { defaultSerovalDeserializerPlugins } = @@ -42,10 +42,19 @@ vi.mock('@tanstack/start-client-core', async (importOriginal) => { beforeEach(() => { mocks.action.mockReset() - mocks.response.status = 200 - mocks.response.statusText = 'OK' }) +function callServerAction(options: Parameters[0]) { + return createServerEntry({ + fetch: async () => { + const result = await handleServerAction(options) + return result instanceof DeferredResponse + ? result.createResponse(getStartEvent()) + : result + }, + }).fetch(options.request) +} + async function readFrames(response: Response) { const frames: Array<{ type: number; payload: Uint8Array }> = [] const reader = response.body!.getReader() @@ -86,7 +95,6 @@ test.each([false, 0, '', null])( request: new Request('http://localhost/_serverFn/test', { method: 'POST', }), - context: {}, serverFnId: 'test', }), ).resolves.toBe(result) @@ -96,12 +104,11 @@ test.each([false, 0, '', null])( test('serializes a complete direct JSON record without LF', async () => { mocks.action.mockResolvedValue({ result: { value: 'complete' } }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -118,12 +125,11 @@ test('cancelling a framed response disposes its serializer', async () => { }) mocks.action.mockResolvedValue({ result: source }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -140,13 +146,12 @@ test('aborting the request disposes a handed-off framed response', async () => { const source = new ReadableStream({ cancel }) mocks.action.mockResolvedValue({ result: new RawStream(source) }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, signal: abortController.signal, }), - context: {}, serverFnId: 'test', }) @@ -179,13 +184,12 @@ test('cancels synchronous RawStreams without pulling when the request is already result: sources.map(({ stream }) => new RawStream(stream)), }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, signal: abortController.signal, }), - context: {}, serverFnId: 'test', }) @@ -216,12 +220,11 @@ test('bounds and cancels synchronous RawStreams when their response remains unre result: sources.map(({ stream }) => new RawStream(stream)), }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -250,12 +253,11 @@ test('a synchronous serialization failure cancels registered raw streams', async const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -265,9 +267,9 @@ test('a synchronous serialization failure cancels registered raw streams', async expect(response.headers.get(X_TSS_SERIALIZED)).toBe('true') expect(response.headers.get('content-type')).toBe('application/json') expect( - fromCrossJSON(await response.json(), { + fromCrossJSON<{ error: unknown }>(await response.json(), { plugins: defaultSerovalDeserializerPlugins, - }), + }).error, ).toBeInstanceOf(Error) } finally { consoleInfo.mockRestore() @@ -287,12 +289,11 @@ test('admits replayed nested RawStream references before their chunks', async () replayed.return(undefined) mocks.action.mockResolvedValue({ result: { replayed } }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -305,12 +306,11 @@ test('frames every record from a synchronously replayed Seroval stream', async ( replayed.return(undefined) mocks.action.mockResolvedValue({ result: { replayed } }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -364,12 +364,11 @@ test('keeps work discovered after a transient synchronous completion', async () }) mocks.action.mockResolvedValue({ result: { replayed, late } }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) resolveLate( @@ -397,16 +396,15 @@ test('bounds synchronously replayed Seroval records before framing', async () => const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) - const error = fromCrossJSON(await response.json(), { + const { error } = fromCrossJSON<{ error: unknown }>(await response.json(), { plugins: defaultSerovalDeserializerPlugins, }) expect(error).toBeInstanceOf(Error) @@ -424,12 +422,11 @@ test('admits late RawStream references before their chunks', async () => { }) mocks.action.mockResolvedValue({ result: { lateRawStream } }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) resolveRawStream( @@ -449,8 +446,6 @@ test('admits late RawStream references before their chunks', async () => { test('rejects a non-ASCII JSON record larger than the wire limit', async () => { const cancel = vi.fn() const source = new ReadableStream({ cancel }) - // h3 leaves the status unset until a handler sets one. - mocks.response.status = undefined as unknown as number mocks.action.mockResolvedValue({ result: { // UTF-16 length is within the old limit, but UTF-8 is over 16 MiB. @@ -459,12 +454,11 @@ test('rejects a non-ASCII JSON record larger than the wire limit', async () => { }, }) - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) @@ -477,35 +471,41 @@ test('rejects a non-ASCII JSON record larger than the wire limit', async () => { }) test.each(['RawStream', 'ReadableStream'])( - 'cancels %s serialization when Response construction rejects it', + 'serializes %s results despite a bodyless helper status', async (kind) => { const cancel = vi.fn() const source = new ReadableStream({ cancel }) - mocks.response.status = 204 - mocks.response.statusText = 'No Content' - mocks.action.mockResolvedValue({ - result: kind === 'RawStream' ? new RawStream(source) : source, + mocks.action.mockImplementation(() => { + setResponseStatus(204, 'No Content') + return { + result: kind === 'RawStream' ? new RawStream(source) : source, + } }) const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + const consoleWarn = vi.spyOn(console, 'warn').mockImplementation(() => {}) try { - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) - expect(response.status).toBe(500) + // Serialized replies always carry a body for the client to decode. + expect(response.status).toBe(200) expect(response.statusText).toBe('') - expect(cancel).toHaveBeenCalledOnce() - expect(source.locked).toBe(false) + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(consoleWarn).toHaveBeenCalledOnce() + const reason = new Error('client disconnected') + await response.body!.cancel(reason) + await vi.waitFor(() => expect(cancel).toHaveBeenCalledOnce()) } finally { consoleInfo.mockRestore() consoleError.mockRestore() + consoleWarn.mockRestore() } }, ) @@ -535,12 +535,11 @@ test('rejects excess RawStreams before starting their readers', async () => { const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const response = await handleServerAction({ + const response = await callServerAction({ request: new Request('http://localhost/_serverFn/test', { method: 'POST', headers: { 'x-tsr-serverFn': 'true' }, }), - context: {}, serverFnId: 'test', }) diff --git a/packages/start-server-core/tests/server-functions-reconciliation.test.ts b/packages/start-server-core/tests/server-functions-reconciliation.test.ts new file mode 100644 index 0000000000..a924fa96e4 --- /dev/null +++ b/packages/start-server-core/tests/server-functions-reconciliation.test.ts @@ -0,0 +1,1588 @@ +// @vitest-environment node + +import { afterAll, afterEach, describe, expect, it, vi } from 'vitest' +import { fromCrossJSON, toJSON } from 'seroval' +import { + RawStream, + isNotFound, + isRedirect, + notFound, + redirect, +} from '@tanstack/router-core' +import { + TSS_FORMDATA_CONTEXT, + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + createCsrfMiddleware, + createMiddleware, + createServerFn, +} from '@tanstack/start-client-core' +import { createStartHandler } from '../src/createStartHandler' +import { + FRAME_HEADER_SIZE, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_JSON, + createClientRpc, +} from '@tanstack/start-client-core/client-rpc' +import { + appendResponseHeader, + getRequestUrl, + getResponseHeader, + setCookie, + setResponseHeader, + setResponseStatus, +} from '../src/request-response' +import { createServerRpc } from '../src/createServerRpc' +import { createSsrRpc } from '../src/createSsrRpc' +import { ServerFunctionSerializationAdapter } from '../src/serializer/ServerFunctionSerializationAdapter' +import type { AnyFunctionMiddleware } from '@tanstack/start-client-core' + +const serverFnMocks = vi.hoisted(() => { + const previousServerFnBase = process.env.TSS_SERVER_FN_BASE + process.env.TSS_SERVER_FN_BASE = '/_serverFn/' + return { + previousServerFnBase, + middleware: [] as Array, + action: undefined as + | undefined + | (ReturnType & { method: string }), + } +}) + +vi.mock('#tanstack-start-entry', () => ({ + startInstance: { + getOptions: () => ({ + requestMiddleware: serverFnMocks.middleware, + serializationAdapters: [], + }), + }, +})) + +vi.mock('../src/getServerFnById', () => ({ + getServerFnById: () => serverFnMocks.action, +})) + +// Run the public client RPC in Node without the compiler's browser replacement. +vi.mock('../../start-client-core/dist/esm/getStartOptions.js', () => ({ + getStartOptions: () => undefined, +})) + +function createServerFunctionRequest( + input = 'http://localhost/_serverFn/test', + init?: RequestInit, +) { + const headers = new Headers(init?.headers) + headers.set('x-tsr-serverFn', 'true') + return new Request(input, { ...init, headers }) +} + +function createAction(method = 'GET') { + return Object.assign(vi.fn(), { method }) +} + +function createHandler() { + return createStartHandler(() => { + throw new Error('Server function requests should not render HTML') + }) +} + +type CallServerFn = (opts?: { + data?: unknown + fetch?: (input: string, init: RequestInit) => Promise +}) => Promise +type AttachHandler = (...args: Array) => CallServerFn & { + __executeServer: (opts: unknown) => Promise +} + +// Calls server function `test` through the client stub a compiled GET call +// site uses, which rethrows failed calls. +function callClientServerFn( + fetch: (input: string, init: RequestInit) => Promise, +) { + return (createServerFn().handler as unknown as AttachHandler)( + createClientRpc('test'), + )({ fetch }) +} + +// Compiled shape of a server function: the provider module registers the +// RPC entry, and callers get a client or server-side stub with the same +// middleware. +function defineServerFn( + method: 'GET' | 'POST', + handler: () => unknown, + middleware: Array = [], +) { + const attach = (extractedFn: unknown, serverFn?: unknown) => + ( + createServerFn({ method }).middleware(middleware) + .handler as unknown as AttachHandler + )(extractedFn, serverFn) + const rpc = createServerRpc( + { id: 'test', name: 'test', filename: 'test.ts' }, + (opts: unknown) => provider.__executeServer(opts), + ) + const provider = attach(rpc, handler) + serverFnMocks.action = rpc as unknown as typeof serverFnMocks.action + const client = attach(createClientRpc('test')) + const onServer = attach(createSsrRpc('test')) + let response: Response | undefined + + return { + call: (data?: unknown) => + client({ + data, + fetch: async (input, init) => { + response = await createHandler()( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + return response + }, + }), + onServer, + response: () => response!, + } +} + +async function readFrames(response: Response) { + const reader = response.body!.getReader() + const frames: Array<{ + type: number + streamId: number + payload: Uint8Array + }> = [] + + while (true) { + const { done, value } = await reader.read() + if (done) { + break + } + const view = new DataView(value.buffer, value.byteOffset) + const length = view.getUint32(5, false) + frames.push({ + type: view.getUint8(0), + streamId: view.getUint32(1, false), + payload: value.slice(FRAME_HEADER_SIZE, FRAME_HEADER_SIZE + length), + }) + } + + return frames +} + +async function settle(promise: Promise) { + try { + return { resolved: await promise } + } catch (rejected) { + return { rejected } + } +} + +afterEach(() => { + serverFnMocks.action = undefined + serverFnMocks.middleware = [] +}) + +afterAll(() => { + if (serverFnMocks.previousServerFnBase === undefined) { + Reflect.deleteProperty(process.env, 'TSS_SERVER_FN_BASE') + } else { + process.env.TSS_SERVER_FN_BASE = serverFnMocks.previousServerFnBase + } +}) + +describe('server function response reconciliation', () => { + it.each(['GET', 'POST'] as const)( + 'preserves request middleware context through the %s RPC terminal', + async (method) => { + const requestContext = Object.freeze({ nonce: 'request' }) + const globalContext = Object.freeze({ + trusted: 'server', + global: 'yes', + }) + const clientContext = Object.freeze({ + trusted: 'client', + client: 'yes', + }) + const events: Array = [] + let resumedContext: unknown + serverFnMocks.middleware = [ + createMiddleware().server(async ({ next }) => { + events.push('outer before') + const result = await next({ context: globalContext }) + resumedContext = result.context + events.push('outer after') + appendResponseHeader('x-steps', 'outer after') + return result + }), + createMiddleware().server(({ next }) => { + events.push('inner') + return next({ context: { inner: 'yes' } }) + }), + ] + // A real server function merges the client context with the trusted + // server context, which wins. + defineServerFn(method, (({ context }: { context: unknown }) => { + events.push('action') + appendResponseHeader('x-steps', 'action') + return context + }) as () => unknown) + const payload = JSON.stringify(toJSON({ context: clientContext })) + const request = createServerFunctionRequest( + method === 'GET' + ? `http://localhost/_serverFn/test?payload=${encodeURIComponent(payload)}` + : 'http://localhost/_serverFn/test', + method === 'GET' + ? undefined + : { + method, + headers: { 'content-type': 'application/json' }, + body: payload, + }, + ) + + const response = await createHandler()(request, { + context: requestContext, + }) + + expect(response.status).toBe(200) + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-steps')).toBe('action, outer after') + expect(fromCrossJSON(await response.json(), {})).toEqual({ + result: { + nonce: 'request', + trusted: 'server', + global: 'yes', + client: 'yes', + inner: 'yes', + }, + }) + expect(resumedContext).toEqual({ + nonce: 'request', + trusted: 'server', + global: 'yes', + inner: 'yes', + }) + expect(events).toEqual(['outer before', 'inner', 'action', 'outer after']) + expect(requestContext).toEqual({ nonce: 'request' }) + expect(globalContext).toEqual({ trusted: 'server', global: 'yes' }) + expect(clientContext).toEqual({ trusted: 'client', client: 'yes' }) + }, + ) + + it.each([202, 204, 205, 304])( + 'includes helper writes made while serializing a synchronous result with status %s', + async (status) => { + const serialized = vi.fn(() => { + setResponseStatus(status, 'Serialized status') + setResponseHeader('x-serialized', 'yes') + appendResponseHeader('x-steps', 'serialized') + setCookie('session', 'serialized', { path: '/' }) + setResponseHeader('content-type', 'text/plain') + setResponseHeader('x-tss-raw', 'true') + return 'serialized value' + }) + const action = createAction() + action.mockReturnValue({ + result: { + get value() { + return serialized() + }, + }, + }) + serverFnMocks.action = action + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(serialized).toHaveBeenCalledOnce() + // A serialized reply always carries a body, so a bodyless helper status + // is ignored together with its status text. + expect(response.status).toBe(status === 202 ? 202 : 200) + expect(response.statusText).toBe( + status === 202 ? 'Serialized status' : '', + ) + expect(response.headers.get('x-serialized')).toBe('yes') + expect(response.headers.get('x-steps')).toBe('serialized') + expect(response.headers.getSetCookie()).toEqual([ + 'session=serialized; Path=/', + ]) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(fromCrossJSON(await response.json(), {})).toEqual({ + result: { value: 'serialized value' }, + }) + }, + ) + + it('keeps a returned fallback when the action it abandoned completes while an outer middleware awaits', async () => { + let releaseAction!: () => void + const actionCanFinish = new Promise((resolve) => { + releaseAction = resolve + }) + let pendingAction: Promise | undefined + const cancelFallback = vi.fn() + const fallback = new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('fallback')) + controller.close() + }, + cancel: cancelFallback, + }), + { status: 504 }, + ) + serverFnMocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + releaseAction() + await pendingAction + return result + }), + createMiddleware().server(({ next }) => { + pendingAction = Promise.resolve(next()) + return fallback + }), + ] + const action = createAction() + action.mockImplementation(async () => { + await actionCanFinish + appendResponseHeader('x-steps', 'action') + return { result: 'completed' } + }) + serverFnMocks.action = action + + try { + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(action).toHaveBeenCalledOnce() + expect(cancelFallback).not.toHaveBeenCalled() + expect(response.status).toBe(504) + expect(response.headers.get('x-tss-serialized')).toBeNull() + // Helper writes belong to the request, so the abandoned action's + // writes still apply to the response that replaced its result. + expect(response.headers.get('x-steps')).toBe('action') + await expect(response.text()).resolves.toBe('fallback') + } finally { + releaseAction() + await pendingAction + } + }) + + it('keeps an early middleware response readable after a late JSON action completes', async () => { + let releaseAction!: () => void + const actionCanFinish = new Promise((resolve) => { + releaseAction = resolve + }) + let pendingAction: Promise | undefined + const cancelFallback = vi.fn() + const fallback = new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('fallback')) + controller.close() + }, + cancel: cancelFallback, + }), + { status: 504, headers: { 'x-fallback': 'yes' } }, + ) + serverFnMocks.middleware = [ + createMiddleware().server(({ next }) => { + pendingAction = Promise.resolve(next()) + return fallback + }), + ] + const action = createAction() + action.mockImplementation(async () => { + await actionCanFinish + return { result: 'late' } + }) + serverFnMocks.action = action + + try { + const response = await createHandler()(createServerFunctionRequest(), {}) + expect(response.status).toBe(504) + + releaseAction() + await pendingAction + + expect(action).toHaveBeenCalledOnce() + expect(cancelFallback).not.toHaveBeenCalled() + expect(response.headers.get('x-fallback')).toBe('yes') + expect(response.headers.get('x-tss-serialized')).toBeNull() + await expect(response.text()).resolves.toBe('fallback') + } finally { + releaseAction() + await pendingAction + } + }) + + it('does not publish late JSON after a pending request is aborted', async () => { + const controller = new AbortController() + const reason = new Error('Request disconnected') + let releaseAction!: () => void + const actionCanFinish = new Promise((resolve) => { + releaseAction = resolve + }) + let actionStarted!: () => void + const started = new Promise((resolve) => { + actionStarted = resolve + }) + let observeResponse!: (value: string | undefined) => void + const observedResponse = new Promise((resolve) => { + observeResponse = resolve + }) + const serialized = vi.fn(() => { + // Observe the request after all late promise continuations have settled. + setImmediate(() => observeResponse(getResponseHeader('x-tss-serialized'))) + return 'late' + }) + const action = createAction() + action.mockImplementation(async () => { + actionStarted() + await actionCanFinish + return { + result: { + get value() { + return serialized() + }, + }, + } + }) + serverFnMocks.action = action + const pending = createHandler()( + createServerFunctionRequest('http://localhost/_serverFn/test', { + signal: controller.signal, + }), + {}, + ) + const rejected = expect(pending).rejects.toBe(reason) + try { + await started + controller.abort(reason) + await rejected + releaseAction() + await expect(observedResponse).resolves.toBeUndefined() + expect(serialized).toHaveBeenCalledOnce() + } finally { + releaseAction() + } + }) + + it('decodes a serialized reply that middleware pipes through a transform', async () => { + const action = createAction() + action.mockReturnValue({ result: 'delegated' }) + serverFnMocks.action = action + serverFnMocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + const response = new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ) + response.headers.set('x-delegated', 'yes') + appendResponseHeader('x-steps', 'delegated') + return response + }), + ] + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-delegated')).toBe('yes') + expect(response.headers.get('x-steps')).toBe('delegated') + expect(fromCrossJSON(await response.json(), {})).toEqual({ + result: 'delegated', + }) + }) + + it('repairs protocol mutations attached to a directly returned next promise', async () => { + const action = createAction() + action.mockReturnValue({ result: 'completed' }) + serverFnMocks.action = action + serverFnMocks.middleware = [ + createMiddleware().server(({ next }) => { + const pending = next() + void Promise.resolve(pending).then((result) => { + result.response.headers.set('content-type', 'text/plain') + result.response.headers.delete('x-tss-serialized') + result.response.headers.set('x-tss-raw', 'true') + appendResponseHeader('x-steps', 'after-next') + }) + return pending + }), + ] + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(response.headers.get('x-steps')).toBe('after-next') + expect(fromCrossJSON(await response.json(), {})).toEqual({ + result: 'completed', + }) + }) + + it('round-trips GET input without normalizing the original query encoding', async () => { + const data = { + spaces: 'one two three', + plus: 'one+two', + tilde: 'one~two', + unicode: 'Grüße 🌍', + percent: '100%', + } + const action = createAction() + action.mockImplementation((payload) => ({ + result: { data: payload.data, requestUrl: getRequestUrl().href }, + })) + serverFnMocks.action = action + const handler = createHandler() + let originalUrl = '' + + const result = await createClientRpc('test')({ + method: 'GET', + data, + fetch: async (input: string, init: RequestInit) => { + const url = new URL(input, 'http://localhost') + const payload = url.searchParams.get('payload')! + // Mix equivalent space encodings and retain literal ~. URLSearchParams + // serialization would canonicalize these even though decoding must not. + const encoded = encodeURIComponent(payload).replace('%20', '+') + const request = new Request( + `http://localhost/_serverFn/test?payload=${encoded}&space=a%20b+c&plus=%2b&tilde=~&unicode=%e2%98%83&percent=%25`, + init, + ) + originalUrl = request.url + return handler(request, {}) + }, + }) + + expect(action).toHaveBeenCalledOnce() + expect(action.mock.calls[0]?.[0].data).toEqual(data) + expect(result).toEqual({ result: { data, requestUrl: originalUrl } }) + }) + + it('does not execute the action when an async CSRF matcher allows an aborted request', async () => { + const controller = new AbortController() + const reason = new Error('Request disconnected') + let resolveMatcher!: (allowed: boolean) => void + let matcherStarted!: () => void + const started = new Promise((resolve) => { + matcherStarted = resolve + }) + const matching = new Promise((resolve) => { + resolveMatcher = resolve + }) + const matcher = vi.fn(() => { + matcherStarted() + return matching + }) + serverFnMocks.middleware = [createCsrfMiddleware({ origin: matcher })] + const action = createAction() + action.mockReturnValue({ result: 'must not execute' }) + serverFnMocks.action = action + + const pending = createHandler()( + createServerFunctionRequest('http://localhost/_serverFn/test', { + signal: controller.signal, + headers: { Origin: 'http://localhost' }, + }), + {}, + ) + const rejected = expect(pending).rejects.toBe(reason) + + try { + await started + expect(action).not.toHaveBeenCalled() + controller.abort(reason) + await rejected + resolveMatcher(true) + // Let the late matcher continuation attempt to enter the next middleware. + await new Promise((resolve) => setImmediate(resolve)) + + expect(matcher).toHaveBeenCalledOnce() + expect(action).not.toHaveBeenCalled() + } finally { + resolveMatcher(true) + } + }) + + it('preserves HTTP-style action error metadata', async () => { + const action = createAction() + const error = Object.assign(new Error('conflict'), { + status: 409, + statusText: 'Conflict', + headers: { 'x-error': 'yes' }, + }) + action.mockImplementation(() => { + throw error + }) + serverFnMocks.action = action + const handler = createHandler() + + const response = await handler(createServerFunctionRequest(), {}) + + expect(response.status).toBe(409) + expect(response.statusText).toBe('Conflict') + expect(response.headers.get('x-error')).toBe('yes') + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe('true') + }) + + it('does not copy upstream Response cause framing or cookies onto serialized errors', async () => { + const action = createAction() + serverFnMocks.middleware = [ + createMiddleware().server(() => { + throw new Error('upstream failed', { + cause: new Response('

upstream

', { + status: 502, + headers: { + 'content-encoding': 'gzip', + 'content-length': '999', + 'content-type': 'text/html', + 'set-cookie': 'upstream=1; Path=/', + 'x-upstream': 'yes', + }, + }), + }) + }), + ] + serverFnMocks.action = action + const handler = createHandler() + let response: Response | undefined + + const call = callClientServerFn(async (input, init) => { + response = await handler( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + return response + }) + + await expect(call).rejects.toThrow('upstream failed') + expect(action).not.toHaveBeenCalled() + expect(response!.status).toBe(502) + expect(response!.headers.get('x-upstream')).toBeNull() + expect(response!.headers.get('content-type')).toBe('application/json') + expect(response!.headers.get('content-encoding')).toBeNull() + expect(response!.headers.get('content-length')).toBeNull() + expect(response!.headers.getSetCookie()).toEqual([]) + }) + + describe('keeps Location off serialized replies', () => { + async function callWithResponse() { + let response: Response | undefined + const call = callClientServerFn(async (input, init) => { + response = await createHandler()( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + return response + }) + return { call, response: () => response! } + } + + it('for JSON results with a helper redirect status', async () => { + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(302) + setResponseHeader('location', '/elsewhere') + return { result: { ok: true } } + }) + serverFnMocks.action = action + + const { call, response } = await callWithResponse() + + await expect(call).resolves.toEqual({ ok: true }) + expect(response().status).toBe(302) + expect(response().headers.get('location')).toBeNull() + }) + + it('for framed results with a helper redirect status', async () => { + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(303) + setResponseHeader('location', '/elsewhere') + return { result: { stream: new RawStream(new ReadableStream()) } } + }) + serverFnMocks.action = action + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.headers.get('content-type')).toBe( + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + ) + expect(response.headers.get('location')).toBeNull() + await response.body!.cancel() + }) + + it('for errors that carry a redirect status and Location', async () => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + serverFnMocks.action = createAction() + serverFnMocks.middleware = [ + createMiddleware().server(() => { + throw Object.assign(new Error('moved'), { + status: 302, + headers: { location: 'https://evil.example/' }, + }) + }), + ] + + try { + const { call, response } = await callWithResponse() + + await expect(call).rejects.toThrow('moved') + expect(response().headers.get('location')).toBeNull() + } finally { + consoleError.mockRestore() + } + }) + + it('for not-found envelopes', async () => { + serverFnMocks.action = createAction() + serverFnMocks.middleware = [ + createMiddleware().server(() => { + setResponseStatus(302) + setResponseHeader('location', '/helper') + throw notFound({ headers: { location: '/not-found' } }) + }), + ] + + const { call, response } = await callWithResponse() + + await expect(call).rejects.toSatisfy((value: unknown) => + isNotFound(value), + ) + expect(response().headers.get('location')).toBeNull() + }) + }) + + it('does not let a helper success status hide a request middleware crash', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + serverFnMocks.action = createAction() + serverFnMocks.middleware = [ + createMiddleware().server(() => { + setResponseStatus(201, 'Created') + throw new TypeError('middleware crashed') + }), + ] + let response: Response | undefined + + try { + await expect( + callClientServerFn(async (input, init) => { + response = await createHandler()( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + return response + }), + ).rejects.toThrow('middleware crashed') + expect(response!.status).toBe(500) + expect(response!.statusText).toBe('') + expect(consoleError).toHaveBeenCalledOnce() + } finally { + consoleError.mockRestore() + } + }) + + it('applies helper headers to serialized action errors', async () => { + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(500) + setResponseHeader('x-error-header', 'yes') + throw new Error('server function failed') + }) + serverFnMocks.action = action + const handler = createHandler() + + const response = await handler(createServerFunctionRequest(), {}) + + expect(response.status).toBe(500) + expect(response.headers.get('x-error-header')).toBe('yes') + expect(response.headers.get('x-tss-serialized')).toBe('true') + }) + + it('protects not-found transport headers from helper overrides', async () => { + const action = createAction() + action.mockImplementation(() => { + setResponseHeader('content-type', 'text/plain') + setResponseHeader('x-tss-serialized', 'true') + throw { isNotFound: true, data: 'missing' } + }) + serverFnMocks.action = action + const handler = createHandler() + + const response = await handler(createServerFunctionRequest(), {}) + + expect(response.status).toBe(404) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe(null) + await expect(response.json()).resolves.toEqual({ + isNotFound: true, + data: 'missing', + }) + }) + + it('preserves caller not-found headers and cookies while normalizing transport headers', async () => { + const cookies = [ + 'session=one; Path=/; Expires=Wed, 21 Oct 2030 07:28:00 GMT', + 'preferences=two; Path=/', + ] + const headers = new Headers({ + 'content-type': 'text/plain', + 'x-tss-serialized': 'true', + 'x-tss-raw': 'true', + 'x-not-found': 'preserved', + }) + for (const cookie of cookies) { + headers.append('set-cookie', cookie) + } + const originalHeaders = Array.from(headers) + const action = createAction() + action.mockImplementation(() => { + setResponseHeader('x-helper', 'also preserved') + throw notFound({ data: 'missing', headers }) + }) + serverFnMocks.action = action + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.status).toBe(404) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-serialized')).toBe(null) + expect(response.headers.get('x-tss-raw')).toBe(null) + expect(response.headers.get('x-not-found')).toBe('preserved') + expect(response.headers.get('x-helper')).toBe('also preserved') + expect(response.headers.getSetCookie()).toEqual(cookies) + expect(Array.from(headers)).toEqual(originalHeaders) + await expect(response.json()).resolves.toEqual({ + isNotFound: true, + data: 'missing', + }) + }) + + it('captures not-found headers before serializing data', async () => { + const headers = new Headers({ 'x-snapshot': 'original' }) + const action = createAction() + action.mockImplementation(() => { + throw notFound({ + headers, + data: { + toJSON() { + headers.set('x-snapshot', 'changed during serialization') + setResponseHeader('x-helper', 'written during serialization') + setResponseHeader('content-type', 'text/plain') + setResponseHeader('x-tss-raw', 'true') + return 'missing' + }, + }, + }) + }) + serverFnMocks.action = action + + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.status).toBe(404) + expect(response.headers.get('x-snapshot')).toBe('original') + expect(response.headers.get('x-helper')).toBe( + 'written during serialization', + ) + expect(response.headers.get('content-type')).toBe('application/json') + expect(response.headers.get('x-tss-raw')).toBeNull() + expect(headers.get('x-snapshot')).toBe('changed during serialization') + await expect(response.json()).resolves.toEqual({ + isNotFound: true, + data: 'missing', + }) + }) + + it.each([204, 205, 304])( + 'keeps serialized success bodies when a helper selects %s', + async (status) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(status) + return { result: { ok: true } } + }) + serverFnMocks.action = action + const handler = createHandler() + let response: Response | undefined + + try { + const result = await createClientRpc('test')({ + method: 'GET', + fetch: async (input: string, init: RequestInit) => { + response = await handler( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + return response + }, + }) + + expect(result).toEqual({ result: { ok: true } }) + expect(response!.status).toBe(200) + expect(response!.headers.get('x-tss-serialized')).toBe('true') + expect(warnSpy).toHaveBeenCalledOnce() + expect(warnSpy.mock.calls[0]![0]).toContain( + `setResponseStatus(${status})`, + ) + } finally { + warnSpy.mockRestore() + } + }, + ) + + it('applies a bodyless helper status to a raw Response result without a warning', async () => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(204) + return { result: new Response('raw body') } + }) + serverFnMocks.action = action + + try { + const response = await createHandler()(createServerFunctionRequest(), {}) + + expect(response.status).toBe(204) + expect(response.body).toBeNull() + expect(response.headers.get('x-tss-raw')).toBe('true') + expect(warnSpy).not.toHaveBeenCalled() + } finally { + warnSpy.mockRestore() + } + }) + + it.each([204, 205, 304])( + 'keeps serialized redirect and not-found envelopes when a helper selects %s', + async (status) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const fetchResponse = async (input: string, init: RequestInit) => + createHandler()( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + + try { + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(status) + throw redirect({ href: '/login' }) + }) + serverFnMocks.action = action + await expect( + createClientRpc('test')({ method: 'GET', fetch: fetchResponse }), + ).rejects.toSatisfy( + (value: unknown) => + isRedirect(value) && value.options.href === '/login', + ) + + serverFnMocks.middleware = [ + createMiddleware().server(() => { + setResponseStatus(status) + throw notFound({ data: 'missing' }) + }), + ] + await expect( + createClientRpc('test')({ method: 'GET', fetch: fetchResponse }), + ).rejects.toSatisfy((value: unknown) => isNotFound(value)) + } finally { + warnSpy.mockRestore() + } + }, + ) + + it('converts oversized GET payload errors', async () => { + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + const action = createAction() + serverFnMocks.action = action + const handler = createHandler() + + try { + const response = await handler( + createServerFunctionRequest( + `http://localhost/_serverFn/test?payload=${'x'.repeat(1_000_001)}`, + ), + {}, + ) + + expect(response.status).toBe(500) + expect(response.headers.get('x-tss-serialized')).toBe('true') + expect(action).not.toHaveBeenCalled() + } finally { + consoleError.mockRestore() + } + }) + + it('falls back to default context for malformed FormData context', async () => { + let receivedContext: unknown + defineServerFn('POST', (({ context }: { context: unknown }) => { + receivedContext = context + return { ok: true } + }) as () => unknown) + const handler = createHandler() + const formData = new FormData() + formData.set(TSS_FORMDATA_CONTEXT, '{not json') + formData.set('field', 'value') + + const response = await handler( + createServerFunctionRequest('http://localhost/_serverFn/test', { + method: 'POST', + body: formData, + }), + {}, + ) + + expect(response.status).toBe(200) + expect(receivedContext).toEqual({}) + }) + + it('streams RawStreams discovered after initial serialization', async () => { + const action = createAction() + action.mockImplementation(() => { + const stream = new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('late')) + controller.close() + }, + }) + return { + result: { + stream: Promise.resolve(new RawStream(stream)), + }, + } + }) + serverFnMocks.action = action + const handler = createHandler() + + const response = await handler(createServerFunctionRequest(), {}) + const frames = await readFrames(response) + const chunkFrame = frames.find((frame) => frame.type === FRAME_TYPE_CHUNK) + + expect(response.headers.get('content-type')).toBe( + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + ) + expect(frames.some((frame) => frame.type === FRAME_TYPE_JSON)).toBe(true) + expect(chunkFrame).toBeDefined() + expect(new TextDecoder().decode(chunkFrame?.payload)).toBe('late') + expect( + frames.some( + (frame) => + frame.type === FRAME_TYPE_END && + frame.streamId === chunkFrame?.streamId, + ), + ).toBe(true) + }) + + it.each([204, 205, 304])( + 'keeps serialized error bodies when a helper or the error selects %s', + async (status) => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + const fetchResponse = async (input: string, init: RequestInit) => { + const response = await createHandler()( + new Request(new URL(input, 'http://localhost'), init), + {}, + ) + expect(response.status).toBe(500) + return response + } + + try { + const action = createAction() + action.mockImplementation(() => { + setResponseStatus(status) + throw new Error('helper status error') + }) + serverFnMocks.action = action + await expect(callClientServerFn(fetchResponse)).rejects.toThrow( + 'helper status error', + ) + + action.mockImplementation(() => { + throw Object.assign(new Error('error status error'), { status }) + }) + await expect(callClientServerFn(fetchResponse)).rejects.toThrow( + 'error status error', + ) + } finally { + warnSpy.mockRestore() + consoleError.mockRestore() + } + }, + ) +}) + +describe('server function throws reach the caller', () => { + // Calls the server function from inside its own handler, as a nested + // server-side call would, and records how the inner call settled. + async function settleOnServer(throwInner: () => never) { + let outcome: { resolved?: unknown; rejected?: unknown } | undefined + let nested = false + const { call, onServer } = defineServerFn('POST', async () => { + if (nested) { + throwInner() + } + nested = true + outcome = await settle(onServer()) + return { ok: true } + }) + + await expect(call()).resolves.toEqual({ ok: true }) + return outcome! + } + + const falsyValues = [undefined, null, 0, '', false, Number.NaN, BigInt(0)] + + describe.each(['GET', 'POST'] as const)('falsy throws over %s', (method) => { + it.each(falsyValues)('rejects with a thrown %s', async (value) => { + const { call } = defineServerFn(method, () => { + throw value + }) + + const outcome = await settle(call()) + + expect(outcome).toHaveProperty('rejected') + expect(Object.is(outcome.rejected, value)).toBe(true) + }) + + it.each(falsyValues)( + 'rejects with %s thrown by function middleware and lets outer middleware catch it', + async (value) => { + let caught: { value: unknown } | undefined + const { call } = defineServerFn(method, () => ({ ok: true }), [ + createMiddleware({ type: 'function' }).server(async ({ next }) => { + try { + return await next() + } catch (error) { + caught = { value: error } + throw error + } + }), + createMiddleware({ type: 'function' }).server(() => { + throw value + }), + ]) + + const outcome = await settle(call()) + + expect(outcome).toHaveProperty('rejected') + expect(Object.is(outcome.rejected, value)).toBe(true) + expect(caught).toBeDefined() + expect(Object.is(caught!.value, value)).toBe(true) + }, + ) + + it('still resolves with a returned undefined', async () => { + const { call } = defineServerFn(method, () => undefined) + + await expect(call()).resolves.toBeUndefined() + }) + }) + + it.each(['GET', 'POST'] as const)( + 'ignores error and result keys a client adds to the %s payload', + async (method) => { + let received: unknown + defineServerFn(method, ((opts: { data: unknown }) => { + received = opts.data + return { ok: true } + }) as () => unknown) + const payload = JSON.stringify( + toJSON({ data: 'input', error: 'crafted', result: 'crafted' }), + ) + + const response = await createHandler()( + method === 'GET' + ? createServerFunctionRequest( + `http://localhost/_serverFn/test?payload=${encodeURIComponent(payload)}`, + ) + : createServerFunctionRequest('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: payload, + }), + {}, + ) + + expect(response.status).toBe(200) + expect(received).toBe('input') + expect(await response.text()).not.toContain('crafted') + }, + ) + + it('rejects a server function received as data when its call fails', async () => { + let outcome: { resolved?: unknown; rejected?: unknown } | undefined + let nested = false + const receivedFn = ServerFunctionSerializationAdapter.fromSerializable({ + functionId: 'test', + }) as unknown as (opts: { data: unknown }) => Promise + const { call } = defineServerFn('POST', async () => { + if (nested) { + throw 0 + } + nested = true + outcome = await settle(receivedFn({ data: 1 })) + return { ok: true } + }) + + await expect(call()).resolves.toEqual({ ok: true }) + expect(outcome).toEqual({ rejected: 0 }) + }) + + it('rejects a server-side call with a thrown 0', async () => { + const outcome = await settleOnServer(() => { + throw 0 + }) + + expect(outcome).toEqual({ rejected: 0 }) + }) + describe.each(['GET', 'POST'] as const)( + 'thrown Responses over %s', + (method) => { + it('rejects with a thrown Response and keeps its status and body', async () => { + const { call, response } = defineServerFn(method, () => { + throw new Response('teapot', { status: 418 }) + }) + + const outcome = await settle(call()) + + expect(outcome.rejected).toBeInstanceOf(Response) + const thrown = outcome.rejected as Response + expect(thrown.status).toBe(418) + await expect(thrown.text()).resolves.toBe('teapot') + expect(response().status).toBe(418) + }) + + it('rejects with a Response thrown by function middleware', async () => { + const { call } = defineServerFn(method, () => ({ ok: true }), [ + createMiddleware({ type: 'function' }).server(() => { + throw Response.json({ denied: true }, { status: 403 }) + }), + ]) + + const outcome = await settle(call()) + + expect(outcome.rejected).toBeInstanceOf(Response) + const thrown = outcome.rejected as Response + expect(thrown.status).toBe(403) + await expect(thrown.json()).resolves.toEqual({ denied: true }) + }) + + it('still resolves with a returned Response', async () => { + const { call } = defineServerFn( + method, + () => new Response('returned', { status: 202 }), + ) + + const outcome = await settle(call()) + + expect(outcome.resolved).toBeInstanceOf(Response) + const returned = outcome.resolved as Response + expect(returned.status).toBe(202) + await expect(returned.text()).resolves.toBe('returned') + }) + }, + ) + + it('rejects a server-side call with a thrown Response', async () => { + const outcome = await settleOnServer(() => { + throw new Response('server-side', { status: 409 }) + }) + + expect(outcome.rejected).toBeInstanceOf(Response) + expect((outcome.rejected as Response).status).toBe(409) + }) + describe('from global request middleware', () => { + function throwFromRequestMiddleware(value: unknown) { + serverFnMocks.middleware = [ + createMiddleware().server(() => { + throw value + }), + ] + return defineServerFn('POST', () => ({ handler: 'ran' })) + } + + it.each([ + ['a string', 'boom'], + ['a plain object', { code: 'E_DENIED' }], + ['an object shaped like a result', { result: 'looks-like-success' }], + ['an object shaped like an error envelope', { error: 'inner' }], + ['zero', 0], + ['undefined', undefined], + ])('rejects with %s', async (_, value) => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + try { + const { call, response } = throwFromRequestMiddleware(value) + + const outcome = await settle(call()) + + expect(outcome).toHaveProperty('rejected') + expect(outcome.rejected).toEqual(value) + expect(response().status).toBe(500) + expect(response().headers.get('x-tss-serialized')).toBe('true') + } finally { + consoleError.mockRestore() + } + }) + + it('rejects with the serialization error for a value that cannot be sent', async () => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + try { + const { call, response } = throwFromRequestMiddleware({ + notSerializable: () => 1, + }) + + const outcome = await settle(call()) + + expect(outcome.rejected).toBeInstanceOf(Error) + expect(response().status).toBe(500) + expect(response().headers.get('x-tss-serialized')).toBe('true') + } finally { + consoleError.mockRestore() + } + }) + + it('re-sends the reply of next() when request middleware throws it', async () => { + serverFnMocks.middleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + throw result.response + }), + ] + const { call } = defineServerFn('POST', () => ({ handler: 'ran' })) + + await expect(call()).resolves.toEqual({ handler: 'ran' }) + }) + + it('rejects with an Error and keeps its message', async () => { + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => {}) + try { + const { call } = throwFromRequestMiddleware(new Error('denied')) + + await expect(call()).rejects.toThrow('denied') + } finally { + consoleError.mockRestore() + } + }) + + it.each([ + ['text', () => new Response('nope', { status: 403 })], + ['JSON', () => Response.json({ nope: true }, { status: 403 })], + ])('rejects with a thrown %s Response', async (_, createResponse) => { + const { call, response } = throwFromRequestMiddleware(createResponse()) + + const outcome = await settle(call()) + + expect(outcome.rejected).toBeInstanceOf(Response) + expect((outcome.rejected as Response).status).toBe(403) + expect(response().status).toBe(403) + }) + }) +}) + +describe('function middleware', () => { + it('passes data and context between client middleware, server middleware and the handler', async () => { + let clientContext: unknown + let serverResult: unknown + const { call } = defineServerFn( + 'POST', + (({ data, context }: { data: unknown; context: object }) => ({ + data, + context: { ...context }, + })) as () => unknown, + [ + createMiddleware({ type: 'function' }) + .validator((data: number) => data + 1) + .client(async ({ next }) => { + const result = await next({ + context: { local: 'client' }, + sendContext: { sent: 'client' }, + }) + clientContext = { ...result.context } + return result + }) + .server(async ({ next }) => { + const result = await next({ + context: { added: 'server' }, + sendContext: { sent: 'server' }, + }) + serverResult = { + context: { ...result.context }, + sendContext: { ...result.sendContext }, + } + return result + }), + ], + ) + + await expect(call(1)).resolves.toEqual({ + data: 2, + context: { sent: 'client', added: 'server' }, + }) + expect(serverResult).toEqual({ + context: { sent: 'client', added: 'server' }, + sendContext: { sent: 'server' }, + }) + expect(clientContext).toEqual({ local: 'client', sent: 'server' }) + }) + + it.each([ + ['leaves out context without sendContext', [], { result: 'ok' }], + [ + 'sends back sendContext as context', + [ + createMiddleware({ type: 'function' }).server(({ next }) => + next({ sendContext: { sent: 'server' } }), + ), + ], + { result: 'ok', context: { sent: 'server' } }, + ], + ])('%s in a reply', async (_, middleware, reply) => { + defineServerFn('POST', () => 'ok', middleware) + + const response = await createHandler()( + createServerFunctionRequest('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify(toJSON({ data: 'input' })), + }), + {}, + ) + + const received = fromCrossJSON(await response.json(), {}) + expect(Object.keys(received)).toEqual(Object.keys(reply)) + expect(received).toEqual(reply) + }) + + it('runs the validator of middleware that has no server function', async () => { + const { call } = defineServerFn( + 'POST', + (({ data }: { data: unknown }) => data) as () => unknown, + [ + createMiddleware({ type: 'function' }) + .validator((data: number) => data * 10) + .client(({ next }) => next()), + ], + ) + + await expect(call(2)).resolves.toBe(20) + }) + + it('skips middleware that already ran as request middleware', async () => { + const runs: Array = [] + const shared = createMiddleware().server(({ next }) => { + runs.push('shared') + return next() + }) + serverFnMocks.middleware = [shared] + const { call } = defineServerFn('POST', () => 'ok', [ + shared as unknown as AnyFunctionMiddleware, + createMiddleware({ type: 'function' }) + .middleware([shared]) + .server(({ next }) => { + runs.push('function') + return next() + }), + ]) + + await expect(call()).resolves.toBe('ok') + expect(runs).toEqual(['shared', 'function']) + }) + + it('resolves with a Response that server middleware returns', async () => { + const handler = vi.fn(() => 'unused') + const { call } = defineServerFn('POST', handler, [ + createMiddleware({ type: 'function' }).server(async ({ next }) => next()), + createMiddleware({ type: 'function' }).server( + (() => new Response('from middleware', { status: 202 })) as never, + ), + ]) + + const outcome = await settle(call()) + + expect(outcome.resolved).toBeInstanceOf(Response) + const returned = outcome.resolved as Response + expect(returned.status).toBe(202) + await expect(returned.text()).resolves.toBe('from middleware') + expect(handler).not.toHaveBeenCalled() + }) + + it('rejects with a redirect that server middleware returns', async () => { + let caught: unknown + const { call } = defineServerFn('POST', () => 'unused', [ + createMiddleware({ type: 'function' }).server(async ({ next }) => { + try { + return await next() + } catch (error) { + caught = error + throw error + } + }), + createMiddleware({ type: 'function' }).server((() => + redirect({ href: '/login' })) as never), + ]) + + const outcome = await settle(call()) + + expect(isRedirect(caught)).toBe(true) + expect(outcome.rejected).toSatisfy( + (value: unknown) => isRedirect(value) && value.options.href === '/login', + ) + }) + + it('lets outer middleware recover from a failure in inner middleware', async () => { + const { call } = defineServerFn('POST', () => 'unused', [ + createMiddleware({ type: 'function' }).server((async ({ + next, + }: { + next: () => Promise + }) => { + try { + return await next() + } catch (error) { + return { result: `recovered from ${(error as Error).message}` } + } + }) as never), + createMiddleware({ type: 'function' }).server(() => { + throw new Error('inner') + }), + ]) + + await expect(call()).resolves.toBe('recovered from inner') + }) + + it('resolves with the handler result even when middleware passed a result to next()', async () => { + const { call } = defineServerFn('POST', () => undefined, [ + createMiddleware({ type: 'function' }).server(({ next }) => + next({ result: 'from middleware' } as never), + ), + ]) + + await expect(call()).resolves.toBeUndefined() + }) + + it('rejects when server middleware returns undefined', async () => { + const { call } = defineServerFn('POST', () => 'unused', [ + createMiddleware({ type: 'function' }).server((() => undefined) as never), + ]) + + await expect(call()).rejects.toThrow( + 'User middleware returned undefined. You must call next() or return a result in your middlewares.', + ) + }) +}) diff --git a/packages/start-server-core/tsconfig.json b/packages/start-server-core/tsconfig.json index ac28a482bf..b142331a03 100644 --- a/packages/start-server-core/tsconfig.json +++ b/packages/start-server-core/tsconfig.json @@ -9,6 +9,7 @@ "src", "tests", "vite.config.ts", + "vitest.bench.config.ts", "../start-client-core/src/start-entry.d.ts" ] } diff --git a/packages/start-server-core/vite.config.ts b/packages/start-server-core/vite.config.ts index a445c8fa1c..09e3bf9539 100644 --- a/packages/start-server-core/vite.config.ts +++ b/packages/start-server-core/vite.config.ts @@ -48,6 +48,7 @@ export default mergeConfig( './src/empty-plugin-adapters.ts', ], externalDeps: [ + 'cookie-es', ...Object.values(VIRTUAL_MODULES), '#tanstack-start-entry', '#tanstack-router-entry', diff --git a/packages/start-server-core/vitest.bench.config.ts b/packages/start-server-core/vitest.bench.config.ts new file mode 100644 index 0000000000..e3152437cc --- /dev/null +++ b/packages/start-server-core/vitest.bench.config.ts @@ -0,0 +1,17 @@ +import { defineConfig, mergeConfig } from 'vitest/config' +import { cpuSimulationExecArgv } from '../../benchmarks/cpu-simulation' +import config from './vite.config' + +export default mergeConfig( + config, + defineConfig({ + test: { + environment: 'node', + execArgv: cpuSimulationExecArgv(), + fileParallelism: false, + benchmark: { + include: ['tests/response-reconciliation.bench.ts'], + }, + }, + }), +) diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index 5cf90eee96..9e64280e30 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,59 @@ # @tanstack/start-static-server-functions +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/react-start@1.169.4 + - @tanstack/solid-start@1.169.4 + - @tanstack/start-client-core@1.170.39 + +## 1.167.43 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.38 + - @tanstack/react-start@1.169.3 + - @tanstack/solid-start@1.169.3 + +## 1.167.42 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-start@1.169.1 + - @tanstack/solid-start@1.169.1 + - @tanstack/start-client-core@1.170.37 + +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae), [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae)]: + - @tanstack/start-client-core@1.170.36 + - @tanstack/react-start@1.169.0 + - @tanstack/solid-start@1.169.0 + +## 1.167.40 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.35 + - @tanstack/react-start@1.168.61 + - @tanstack/solid-start@1.168.58 + +## 1.167.39 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-start@1.168.60 + - @tanstack/solid-start@1.168.57 + - @tanstack/start-client-core@1.170.34 + ## 1.167.38 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index 3bda76b2ad..603d7524fb 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.38", + "version": "1.167.44", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index b18837c3a3..c8669ed975 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,53 @@ # @tanstack/start-storage-context +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + +## 1.167.39 + +### Patch Changes + +- [#8451](https://github.com/TanStack/router/pull/8451) [`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8) - Skip request middleware bookkeeping when no request middleware is configured, and stop copying serialization adapters when the router adds none. + + Server route handlers and route middleware now receive the router's decoded pathname, the same one used for route matching. Characters that would change how the path is read, such as `%2F`, `%3F`, and `%23`, stay encoded. + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + +## 1.167.38 + +### Patch Changes + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Reduce per-request work in Start: `getNormalizedURL` reads a `URL` input without cloning it, and `runWithStartContext` returns the callback's own result instead of wrapping it in a promise, so a synchronous throw from the callback now propagates synchronously. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + +## 1.167.37 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + +## 1.167.36 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.167.35 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 47d65c1e00..083facb749 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.35", + "version": "1.167.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/src/async-local-storage.ts b/packages/start-storage-context/src/async-local-storage.ts index 21aabd6cdf..bbde704629 100644 --- a/packages/start-storage-context/src/async-local-storage.ts +++ b/packages/start-storage-context/src/async-local-storage.ts @@ -16,7 +16,7 @@ export interface StartStorageContext { contextAfterGlobalMiddlewares: any // Track middlewares that have already executed in the request phase // to prevent duplicate execution - executedRequestMiddlewares: Set + executedRequestMiddlewares?: Set // Type of handler processing this request handlerType: StartHandlerType @@ -42,10 +42,10 @@ if (!globalObj[GLOBAL_STORAGE_KEY]) { const startStorage = globalObj[GLOBAL_STORAGE_KEY] -export async function runWithStartContext( +export function runWithStartContext( context: StartStorageContext, - fn: () => T | Promise, -): Promise { + fn: () => T, +): T { return startStorage.run(context, fn) } diff --git a/packages/valibot-adapter/tests/index.test.tsx b/packages/valibot-adapter/tests/index.test.tsx index 327de3093e..b59c29d075 100644 --- a/packages/valibot-adapter/tests/index.test.tsx +++ b/packages/valibot-adapter/tests/index.test.tsx @@ -9,7 +9,6 @@ import { import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, test, vi } from 'vitest' import { valibotValidator } from '../src' -import '@testing-library/jest-dom/vitest' afterEach(() => { vi.resetAllMocks() diff --git a/packages/valibot-adapter/tests/jest-dom.setup.ts b/packages/valibot-adapter/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/valibot-adapter/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/valibot-adapter/vite.config.ts b/packages/valibot-adapter/vite.config.ts index 8c8c0c519f..8d553e0a59 100644 --- a/packages/valibot-adapter/vite.config.ts +++ b/packages/valibot-adapter/vite.config.ts @@ -9,6 +9,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, }) diff --git a/packages/vue-router-devtools/CHANGELOG.md b/packages/vue-router-devtools/CHANGELOG.md index 275c8c9d48..ff72e56c32 100644 --- a/packages/vue-router-devtools/CHANGELOG.md +++ b/packages/vue-router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/vue-router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies [[`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0)]: + - @tanstack/router-devtools-core@1.168.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/vue-router-devtools/package.json b/packages/vue-router-devtools/package.json index 4c8405dca7..411dd289be 100644 --- a/packages/vue-router-devtools/package.json +++ b/packages/vue-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 1224692281..a9cdeb2b70 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,58 @@ # @tanstack/vue-router +## 1.170.42 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + +## 1.170.41 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + +## 1.170.40 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + +## 1.170.39 + +### Patch Changes + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + +## 1.170.38 + +### Patch Changes + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8579](https://github.com/TanStack/router/pull/8579) [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b) - Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Solid and Vue Links reuse the router's built destination across navigations and derive their state through fewer reactive nodes. Solid Links call a user `ref` once per element and create no reactive nodes on the server. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + +## 1.170.37 + +### Patch Changes + +- [#8568](https://github.com/TanStack/router/pull/8568) [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949) - Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.170.36 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index fa84727b2d..93ae8fdeed 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.36", + "version": "1.170.42", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", @@ -75,7 +75,7 @@ "dependencies": { "@tanstack/history": "workspace:*", "@tanstack/router-core": "workspace:*", - "@tanstack/vue-store": "^0.11.0", + "@tanstack/vue-store": "^0.11.2", "@vue/runtime-dom": "^3.5.25", "isbot": "catalog:" }, diff --git a/packages/vue-router/skills/vue-router/SKILL.md b/packages/vue-router/skills/vue-router/SKILL.md index 5fea4fef7a..61c13bef1f 100644 --- a/packages/vue-router/skills/vue-router/SKILL.md +++ b/packages/vue-router/skills/vue-router/SKILL.md @@ -21,7 +21,7 @@ sources: # Vue Router (`@tanstack/vue-router`) -This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) first for foundational concepts. +This skill builds on router-core. Read `@tanstack/router-core#router-core` first for foundational concepts. This skill covers the Vue-specific bindings, components, composables, and setup for TanStack Router. @@ -390,4 +390,4 @@ Must set `target: 'vue'` in the router plugin config. Default is `'react'`. ## Cross-References -- [router-core/SKILL.md](../../../router-core/skills/router-core/SKILL.md) — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx index de1bcfa67a..0c3ff40f1d 100644 --- a/packages/vue-router/src/Match.tsx +++ b/packages/vue-router/src/Match.tsx @@ -6,7 +6,7 @@ import { CatchBoundary } from './CatchBoundary' import { ClientOnly } from './ClientOnly' import { useRouter } from './useRouter' import { CatchNotFound } from './not-found' -import { routeIdContext } from './matchContext' +import { provideLinkLocation, routeIdContext } from './matchContext' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' import { @@ -37,6 +37,11 @@ export const Match = Vue.defineComponent({ // Provide routeId context (stable string) for children. // MatchInner, Outlet, and useMatch all consume this. Vue.provide(routeIdContext, routeId) + // This match's links hold their location while a navigation leaves it. + // Server links read the live location. + if (!(isServer ?? router.isServer)) { + provideLinkLocation(router, routeId) + } return (): VNode => { const match = activeMatch.value diff --git a/packages/vue-router/src/RouterProvider.tsx b/packages/vue-router/src/RouterProvider.tsx index 769a19a4f2..874a24fef0 100644 --- a/packages/vue-router/src/RouterProvider.tsx +++ b/packages/vue-router/src/RouterProvider.tsx @@ -1,6 +1,8 @@ import * as Vue from 'vue' +import { isServer } from '@tanstack/router-core/isServer' import { Matches } from './Matches' import { provideRouter } from './routerContext' +import { provideLinkLocation } from './matchContext' import type { AnyRouter, RegisteredRouter, @@ -23,6 +25,10 @@ export const RouterContextProvider = Vue.defineComponent({ // Provide router to all child components provideRouter(router) + // Links outside every match follow the live location. + if (!(isServer ?? router.isServer)) { + provideLinkLocation(router) + } return () => { // Allow the router to update options on the router instance diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index cb964c7381..34666743e3 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -9,8 +9,8 @@ import { } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' import { useRouter } from './useRouter' +import { linkLocationContext } from './matchContext' import { useIntersectionObserver } from './utils' import type { @@ -29,8 +29,6 @@ import type { type EventHandler = (e: TEvent) => void -const timeoutMap = new WeakMap>() - type DataAttributes = { [K in `data-${string}`]?: unknown } @@ -110,18 +108,16 @@ function useLinkPropsImpl( // Ensure router is defined before proceeding if (!router) { console.warn('useRouter must be used inside a component!') - return Vue.computed(() => ({})) as unknown as LinkHTMLAttributes + return {} } - const ref = Vue.ref(null) - // During SSR we render exactly once and do not need reactivity. // Avoid store subscriptions, effects and observers on the server. if (isServer ?? router.isServer) { const options = getOptions() if (getUrlScheme(`${options.to}`)) { - return Vue.ref( - getExternalLinkProps(options, router, ref), + return Vue.shallowRef( + getExternalLinkProps(options, router), ) as unknown as LinkHTMLAttributes } @@ -152,162 +148,166 @@ function useLinkPropsImpl( resolvedStyle, }) - return Vue.ref( + return Vue.shallowRef( result as LinkHTMLAttributes, ) as unknown as LinkHTMLAttributes } - // Determine if the link is external or internal. This is client-only so - // server renders do not allocate a computed wrapper for every link. - const isExternal = Vue.computed(() => !!getUrlScheme(`${getOptions().to}`)) + const ref = Vue.ref(null) - const currentLocation: Vue.Ref< - ReturnType - > = isExternal.value - ? Vue.shallowRef(router.stores.location.get()) - : (useSelector(router.stores.location, (l) => l, { - compare: (prev, next) => prev.href === next.href, - }) as Vue.Ref>) + const isExternal = () => !!getUrlScheme(`${getOptions().to}`) - // Links that start external skip useSelector above. Subscribe if they later - // become internal so active state follows subsequent location changes. - if (isExternal.value) { - Vue.watchEffect((onCleanup) => { - if (isExternal.value) { - return + // Links build from the location their match presents, or the router's live + // one outside every match. External links never read it. + const source = Vue.inject(linkLocationContext)! + + // Rebuild only when the href moves. + const currentLocation = Vue.computed((prev?: ParsedLocation) => + prev?.href === source.value.href ? prev : source.value, + ) + + // The Link's own destination options, replaced only when a navigation + // option changes identity: the router reuses a location built from the same + // object without reading the current location. A reactive value changes in + // place, so a reactive option value (checked one level deep, not nested) + // gets a fresh object per location instead, re-read at each navigation. A + // mask holds destination options of its own, so its values are checked too. + const dest = Vue.computed((prev?: Record) => { + const options = getOptions() as Record + const dest: Record = {} + let same = !!prev + for (const key of NAVIGATION_KEYS) { + const value = (dest[key] = options[key]) + if ( + Vue.isProxy(value) || + (key === 'mask' && value && Object.values(value).some(Vue.isProxy)) + ) { + // Track the location: a reactive value is re-read at each one. + same = !currentLocation.value } + same &&= prev![key] === value + } + return same ? prev! : dest + }) - const store = router.stores.location - // Catch up on navigations while this external link was unsubscribed. - currentLocation.value = store.get() - const subscription = store.subscribe((location) => { - if (currentLocation.value.href !== location.href) { - currentLocation.value = location - } - }) - onCleanup(() => subscription.unsubscribe()) + // Clicks and preloads build from the latest location the Link's match + // presents. + const navigateOptions = () => { + const options = dest.value + options._fromLocation = source.value + return options as any + } + + // [href, active] of an internal Link, derived in one computation. An + // unchanged result keeps its identity, so a navigation that leaves the Link + // as it was notifies nothing downstream. + const state = Vue.computed((prev?: LinkState): LinkState => { + const options = getOptions() + const destOptions = dest.value + // Rebuild when inherited search/hash or the current route context changes. + destOptions._fromLocation = currentLocation.value + const next = router.buildLocation(destOptions as any) + const href = getHref(options, router, next) + const isActive = + !options.disabled && (href === undefined || !!getUrlScheme(href)) + ? false + : getIsActive( + currentLocation.value, + next, + options.activeOptions, + router, + ) + return prev && + prev[0 /* href */] === href && + prev[1 /* isActive */] === isActive + ? prev + : [href, isActive] + }) + + // The requested mode does not depend on the location, so the preload + // effects do not run on navigations. + const preloadMode = Vue.computed(() => { + const options = getOptions() + return ( + !isExternal() && + !options.reloadDocument && + !options.disabled && + (options.preload ?? router.options.defaultPreload) + ) + }) + const preload = () => { + const href = !isExternal() && state.value[0 /* href */] + return !!href && !getUrlScheme(href) && preloadMode.value + } + + const preloadDelay = () => + getOptions().preloadDelay ?? router.options.defaultPreloadDelay ?? 0 + + const doPreload = () => { + return router.preloadRoute(navigateOptions()).catch((err: any) => { + console.warn(err) + console.warn(preloadWarning) }) } - const next = Vue.computed(() => { - // Rebuild when inherited search/hash or the current route context changes. - - const options = getOptions() - const opts = { _fromLocation: currentLocation.value, ...options } - return router.buildLocation(opts) - }) - - const href = Vue.computed(() => { - const options = getOptions() - return getHref(options, router, next.value) - }) - - const preload = Vue.computed(() => { - const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) || - options.reloadDocument || - options.disabled - ) { - return false - } - return options.preload ?? router.options.defaultPreload - }) - - const preloadDelay = Vue.computed( - () => getOptions().preloadDelay ?? router.options.defaultPreloadDelay ?? 0, - ) - - const isActive = Vue.computed(() => { - const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) - ) { - return false - } - return getIsActive( - currentLocation.value, - next.value, - options.activeOptions, - router, - ) - }) - - const doPreload = () => { - const options = getOptions() - return router - .preloadRoute(options as Parameters[0]) - .catch((err: any) => { - console.warn(err) - console.warn(preloadWarning) - }) - } - let pendingPreload: 'intent' | 'viewport' | undefined + let preloadTimeout: ReturnType | undefined + const cancelPreload = () => { + clearTimeout(preloadTimeout) + preloadTimeout = pendingPreload = undefined + } const enqueuePreload = ( e?: MouseEvent | FocusEvent | IntersectionObserverEntry, ) => { if (!e) { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() return } const isIntersecting = (e as IntersectionObserverEntry).isIntersecting const preloadMode = isIntersecting === undefined ? 'intent' : 'viewport' - if (preload.value !== preloadMode || isIntersecting === false) { + if (preload() !== preloadMode || isIntersecting === false) { if (isIntersecting === false && pendingPreload === 'viewport') { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() } return } - if (!preloadDelay.value) { + if (!preloadDelay()) { doPreload() return } - if (!timeoutMap.has(ref)) { - const scheduledHref = next.value.href + if (!preloadTimeout) { + const scheduledHref = state.value[0 /* href */] pendingPreload = preloadMode - timeoutMap.set( - ref, - setTimeout(() => { - timeoutMap.delete(ref) - pendingPreload = undefined - if ( - preload.value === preloadMode && - next.value.href === scheduledHref - ) { - doPreload() - } - }, preloadDelay.value), - ) + preloadTimeout = setTimeout(() => { + preloadTimeout = pendingPreload = undefined + if ( + preload() === preloadMode && + state.value[0 /* href */] === scheduledHref + ) { + doPreload() + } + }, preloadDelay()) } } useIntersectionObserver( ref, enqueuePreload, - () => preload.value !== 'viewport', + () => preloadMode.value !== 'viewport', // Intent preloading still needs timer cleanup without an observer. - () => !!preload.value, + () => !!preloadMode.value, ) Vue.watchEffect(() => { - if (preload.value !== 'render') { + if (preloadMode.value !== 'render' || !preload()) { return } - const nextHref = next.value.href + const nextHref = state.value[0 /* href */] if (nextHref && renderFetchedHref !== nextHref) { renderFetchedHref = nextHref doPreload() @@ -317,11 +317,8 @@ function useLinkPropsImpl( // The click handler const handleClick = (e: PointerEvent): void => { const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) - ) { + const href = !isExternal() && state.value[0 /* href */] + if (!options.disabled && (!href || getUrlScheme(href))) { return } @@ -345,31 +342,22 @@ function useLinkPropsImpl( } e.preventDefault() + enqueuePreload() // All is well? Navigate! - router.navigate({ - ...options, - replace: options.replace, - resetScroll: options.resetScroll, - hashScrollIntoView: options.hashScrollIntoView, - startTransition: options.startTransition, - viewTransition: options.viewTransition, - ignoreBlocker: options.ignoreBlocker, - }) + router.navigate(navigateOptions()) } } const handleTouchStart = () => { - if (preload.value === 'intent') { + if (preload() === 'intent') { doPreload() } } const handleLeave = () => { if (pendingPreload === 'intent') { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() } } @@ -383,12 +371,6 @@ function useLinkPropsImpl( } } - // Get the active and inactive props - const resolvedStyleProps = Vue.computed(() => { - const options = getOptions() - return resolveStyleProps(options, isActive.value) - }) - // Create static event handlers that don't change between renders const staticEventHandlers: LinkEventHandlers = { onClick: composeEventHandlers(() => getOptions().onClick, handleClick), @@ -420,18 +402,21 @@ function useLinkPropsImpl( // Using Vue.computed ensures props are calculated at render time, not after const computedProps = Vue.computed(() => { const options = getOptions() - if (isExternal.value) { + if (isExternal()) { return getExternalLinkProps(options, router, ref, staticEventHandlers) } - const { resolvedProps, resolvedClass, resolvedStyle } = - resolvedStyleProps.value + const [href, isActive] = state.value + const { resolvedProps, resolvedClass, resolvedStyle } = resolveStyleProps( + options, + isActive, + ) return combineResultProps({ - href: href.value, + href, options, ref, staticEventHandlers, - isActive: isActive.value, + isActive, resolvedProps, resolvedClass, resolvedStyle, @@ -442,6 +427,28 @@ function useLinkPropsImpl( return computedProps as unknown as LinkHTMLAttributes } +// [href, active] of an internal Link. +type LinkState = [href: string | undefined, isActive: boolean] + +// Options that decide where and how a Link navigates. +const NAVIGATION_KEYS = [ + 'to', + 'replace', + 'resetScroll', + 'hashScrollIntoView', + 'startTransition', + 'viewTransition', + 'ignoreBlocker', + 'params', + 'search', + 'hash', + 'state', + 'mask', + 'unsafeRelative', + 'from', + 'href', +] as const + function resolveStyleProps(options: AnyLinkPropsOptions, isActive: boolean) { const props = (isActive ? options.activeProps : options.inactiveProps) || @@ -539,7 +546,7 @@ function combineResultProps({ function getExternalLinkProps( options: AnyLinkPropsOptions, router: AnyRouter, - ref: Vue.Ref, + ref?: Vue.Ref, staticEventHandlers?: LinkEventHandlers, ): LinkHTMLAttributes { const dangerous = isDangerousProtocol( @@ -599,56 +606,45 @@ function getLinkEventHandlers( } } -const getPropsSafeToSpread = (options: AnyLinkPropsOptions) => { - const { - activeProps: _activeProps, - inactiveProps: _inactiveProps, - activeOptions: _activeOptions, - to: _to, - preload: _preload, - preloadDelay: _preloadDelay, - preloadIntentProximity: _preloadIntentProximity, - hashScrollIntoView: _hashScrollIntoView, - replace: _replace, - startTransition: _startTransition, - resetScroll: _resetScroll, - viewTransition: _viewTransition, - children: _children, - target: _target, - disabled: _disabled, - style: _style, - class: _class, - onClick: _onClick, - onBlur: _onBlur, - onFocus: _onFocus, - onMouseEnter: _onMouseEnter, - onMouseenter: _onMouseenter, - onMouseLeave: _onMouseLeave, - onMouseleave: _onMouseleave, - onMouseOver: _onMouseOver, - onMouseover: _onMouseover, - onMouseOut: _onMouseOut, - onMouseout: _onMouseout, - onTouchStart: _onTouchStart, - onTouchstart: _onTouchstart, - ignoreBlocker: _ignoreBlocker, - params: _params, - search: _search, - hash: _hash, - state: _state, - mask: _mask, - reloadDocument: _reloadDocument, - unsafeRelative: _unsafeRelative, - _asChild: __asChild, - from: _from, - additionalProps: _additionalProps, - ...propsSafeToSpread - } = options as AnyLinkPropsOptions & { - additionalProps?: unknown - children?: unknown - _asChild?: unknown - } +// Options the Link consumes; every other option is an element prop. +const LINK_OPTION_KEYS = new Set([ + ...NAVIGATION_KEYS, + 'activeProps', + 'inactiveProps', + 'activeOptions', + 'preload', + 'preloadDelay', + 'preloadIntentProximity', + 'children', + 'target', + 'disabled', + 'style', + 'class', + 'onClick', + 'onBlur', + 'onFocus', + 'onMouseEnter', + 'onMouseenter', + 'onMouseLeave', + 'onMouseleave', + 'onMouseOver', + 'onMouseover', + 'onMouseOut', + 'onMouseout', + 'onTouchStart', + 'onTouchstart', + 'reloadDocument', + '_asChild', + 'additionalProps', +]) +const getPropsSafeToSpread = (options: AnyLinkPropsOptions) => { + const propsSafeToSpread: Record = {} + for (const key in options) { + if (!LINK_OPTION_KEYS.has(key)) { + propsSafeToSpread[key] = (options as Record)[key] + } + } return propsSafeToSpread } @@ -857,6 +853,34 @@ export function createLink( }) as any } +function useLinkPropsSnapshot( + props: Record, + attrs: Record, +) { + const attrsSnapshot = Vue.shallowRef({ ...attrs }) + Vue.onBeforeUpdate(() => { + const keys = Object.keys(attrs) + const previous = attrsSnapshot.value + if ( + keys.length !== Object.keys(previous).length || + keys.some((key) => !Object.is(attrs[key], previous[key])) + ) { + attrsSnapshot.value = { ...attrs } + } + }) + + // Keep a plain cached snapshot so location-only updates do not repeatedly + // cross Vue's props and attrs proxies for every link computation. + const allProps = Vue.computed( + () => + ({ + ...props, + ...attrsSnapshot.value, + }) as AnyLinkPropsOptions, + ) + return () => allProps.value +} + const LinkImpl = Vue.defineComponent({ name: 'Link', inheritAttrs: false, @@ -887,27 +911,12 @@ const LinkImpl = Vue.defineComponent({ 'target', ], setup(props, { attrs, slots }) { - const attrsSnapshot = Vue.shallowRef({ ...attrs }) - Vue.onBeforeUpdate(() => { - const keys = Object.keys(attrs) - const previous = attrsSnapshot.value - if ( - keys.length !== Object.keys(previous).length || - keys.some((key) => !Object.is(attrs[key], previous[key])) - ) { - attrsSnapshot.value = { ...attrs } - } - }) - - // Keep a plain cached snapshot so location-only updates do not repeatedly - // cross Vue's props and attrs proxies for every link computation. - const allProps = Vue.computed(() => ({ - ...props, - ...attrsSnapshot.value, - })) - const linkPropsSource = useLinkPropsImpl(() => allProps.value) as - | LinkHTMLAttributes - | Vue.ComputedRef + // The server renders once: read the props directly. + const linkPropsSource = useLinkPropsImpl( + (isServer ?? useRouter()?.isServer) + ? () => ({ ...props, ...attrs }) + : useLinkPropsSnapshot(props, attrs), + ) as LinkHTMLAttributes | Vue.ComputedRef return () => { const Component = props._asChild || 'a' diff --git a/packages/vue-router/src/matchContext.tsx b/packages/vue-router/src/matchContext.tsx index 01ed6d35de..d46757f443 100644 --- a/packages/vue-router/src/matchContext.tsx +++ b/packages/vue-router/src/matchContext.tsx @@ -1,4 +1,7 @@ -import type { InjectionKey } from 'vue' +import * as Vue from 'vue' +import { _isRouteDeparting } from '@tanstack/router-core' +import type { InjectionKey, Ref } from 'vue' +import type { AnyRouter, ParsedLocation } from '@tanstack/router-core' // Stable routeId context — a plain string (not reactive) that identifies // which route this component belongs to. Provided by Match, consumed by @@ -6,3 +9,31 @@ import type { InjectionKey } from 'vue' export const routeIdContext = Symbol( 'TanStackRouterRouteId', ) as InjectionKey + +// The location the links of the nearest match, or of the router outside every +// match, build from. Provided on the client only. +export const linkLocationContext = Symbol( + 'TanStackRouterLinkLocation', +) as InjectionKey>> + +/** + * Provides the location the links below build from. A location publication + * whose navigation leaves `routeId` keeps the location the route still + * presents, so its links do no work: the route unmounts when that navigation + * commits, and any other outcome publishes a newer location. The store calls + * this subscription synchronously inside the publication, the only time the + * predicate is valid. Without a route the location is the live one. Links + * hand it to the router, so it stays raw rather than a readonly proxy. + */ +export function provideLinkLocation(router: AnyRouter, routeId?: string) { + const store = router.stores.location + const linkLocation = Vue.shallowRef(store.get()) + Vue.onScopeDispose( + store.subscribe((location) => { + if (!_isRouteDeparting(router, routeId, location)) { + linkLocation.value = location + } + }).unsubscribe, + ) + Vue.provide(linkLocationContext, linkLocation) +} diff --git a/packages/vue-router/src/utils.ts b/packages/vue-router/src/utils.ts index c5e3796384..10b059c4a5 100644 --- a/packages/vue-router/src/utils.ts +++ b/packages/vue-router/src/utils.ts @@ -34,7 +34,6 @@ export const usePrevious = (fn: () => boolean) => { * @param callback - The callback to call when the intersection changes * @param disabled - Whether observation is disabled * @param cleanupWhenDisabled - Whether cleanup is needed without an observer (defaults to true) - * @returns The IntersectionObserver instance * @example * ```tsx * const MyComponent = () => { @@ -52,10 +51,9 @@ export function useIntersectionObserver( callback: (entry?: IntersectionObserverEntry) => void, disabled: () => boolean, cleanupWhenDisabled?: () => boolean, -): Vue.Ref { +): void { const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function' - const observerRef = Vue.ref(null) // Use watchEffect with cleanup to properly manage the observer lifecycle Vue.watchEffect((onCleanup) => { @@ -78,18 +76,14 @@ export function useIntersectionObserver( { rootMargin: '100px' }, ) - observerRef.value = observer observer.observe(r) onCleanup(() => { active = false observer.disconnect() - observerRef.value = null callback() }) }) - - return observerRef } export function splitProps>( diff --git a/packages/vue-router/tests/Scripts.test.tsx b/packages/vue-router/tests/Scripts.test.tsx index 8d6724076b..7336b95f4f 100644 --- a/packages/vue-router/tests/Scripts.test.tsx +++ b/packages/vue-router/tests/Scripts.test.tsx @@ -299,6 +299,11 @@ describe('ssr HeadContent', () => { .querySelector('link[rel="modulepreload"]') ?.getAttribute('crossorigin'), ).toBe('anonymous') + expect( + document.head + .querySelector('link[rel="modulepreload"]') + ?.getAttribute('fetchpriority'), + ).toBe('low') }) test('does not duplicate SSR head links and cleans up preloads on unmount', async () => { @@ -311,6 +316,7 @@ describe('ssr HeadContent', () => { const ssrPreload = document.createElement('link') ssrPreload.setAttribute('rel', 'modulepreload') ssrPreload.setAttribute('href', '/main.js') + ssrPreload.setAttribute('fetchpriority', 'low') document.head.append(ssrStylesheet, ssrPreload) @@ -397,6 +403,7 @@ describe('ssr HeadContent', () => { const ssrPreload = document.createElement('link') ssrPreload.setAttribute('rel', 'modulepreload') ssrPreload.setAttribute('href', '/index.js') + ssrPreload.setAttribute('fetchpriority', 'low') document.head.append(ssrStylesheet, ssrPreload) @@ -730,7 +737,7 @@ describe('ssr HeadContent', () => { ).toBe('.runtime{color:red}') }) - test('renders preload as script links for iife manifest preloads', async () => { + test('renders iife manifest preloads as low priority script links', async () => { const history = createTestBrowserHistory() const rootRoute = createRootRoute({ @@ -770,6 +777,11 @@ describe('ssr HeadContent', () => { }) expect(document.head.querySelector('link[rel="modulepreload"]')).toBeFalsy() + expect( + document.head + .querySelector('link[rel="preload"][as="script"]') + ?.getAttribute('fetchpriority'), + ).toBe('low') }) test('derives title, dedupes meta, and allows non-loader HeadContent', async () => { diff --git a/packages/vue-router/tests/blocker.test.tsx b/packages/vue-router/tests/blocker.test.tsx index 46568d8652..fdd9fa4931 100644 --- a/packages/vue-router/tests/blocker.test.tsx +++ b/packages/vue-router/tests/blocker.test.tsx @@ -1,5 +1,4 @@ import { defineComponent } from 'vue' -import '@testing-library/jest-dom/vitest' import { afterEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/vue' import combinate from 'combinate' diff --git a/packages/vue-router/tests/jest-dom.setup.ts b/packages/vue-router/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/vue-router/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/vue-router/tests/link-departing-scope.test.tsx b/packages/vue-router/tests/link-departing-scope.test.tsx new file mode 100644 index 0000000000..71b917bebf --- /dev/null +++ b/packages/vue-router/tests/link-departing-scope.test.tsx @@ -0,0 +1,1127 @@ +import { setFlagsFromString } from 'node:v8' +import { runInNewContext } from 'node:vm' +import * as Vue from 'vue' +import { + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@testing-library/vue' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouteMask, + createRouter, + redirect, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +type Deferred = { + promise: Promise + resolve: () => void +} + +function deferred(): Deferred { + let resolve!: () => void + const promise = new Promise((r) => (resolve = r)) + return { promise, resolve } +} + +// Lets the router run its microtask-driven load steps and Vue flush renders. +const tick = () => new Promise((resolve) => setTimeout(resolve, 0)) + +type Gates = Partial> + +function setup({ + initial = '/a', + bAfterGate, + beforeRender, +}: { + initial?: string + bAfterGate?: () => void + beforeRender?: (router: any) => void +} = {}) { + const gates: Gates = {} + const counts = { + aUpdater: 0, + aRenders: 0, + goneUpdater: 0, + listUpdater: 0, + } + // The `x` dependency of every `/a` load, preloads included. + const aLoads: Array = [] + // The `x` of every location the `a-next` link derives from. + const nextFrom: Array = [] + const hash = Vue.ref(undefined) + const extra = Vue.ref(false) + const gone = Vue.ref(false) + const renderPreload = Vue.ref(false) + const list = Vue.ref(['one', 'two']) + const controls: { + setHash: (value: string | undefined) => Promise + setExtra: (value: boolean) => Promise + setGone: (value: boolean) => Promise + setRenderPreload: (value: boolean) => Promise + setList: (value: Array) => Promise + } = { + setHash: (value) => ((hash.value = value), Vue.nextTick()), + setExtra: (value) => ((extra.value = value), Vue.nextTick()), + setGone: (value) => ((gone.value = value), Vue.nextTick()), + setRenderPreload: (value) => ( + (renderPreload.value = value), + Vue.nextTick() + ), + setList: (value) => ((list.value = value), Vue.nextTick()), + } + + // Stable updaters, and one component per changing part, so that changing + // one part does not re-render the other links. + const aSelfSearch = (prev: any) => { + counts.aUpdater++ + return prev + } + const aSelfSlot = ({ isActive }: { isActive: boolean }) => { + counts.aRenders++ + return isActive ? 'a self' : 'a self (inactive)' + } + const aNextSearch = (prev: any) => { + nextFrom.push(prev.x) + return { x: `${prev.x}-next` } + } + const aRenderSearch = (prev: any) => ({ x: `${prev.x}-render` }) + const sameSearch = (prev: any) => prev + const goneSearch = (prev: any) => { + counts.goneUpdater++ + return prev + } + const listSearches = new Map any>() + const listSearch = (item: string) => { + let search = listSearches.get(item) + if (!search) { + search = (prev: any) => { + counts.listUpdater++ + return { ...prev, item } + } + listSearches.set(item, search) + } + return search + } + + const ADot = Vue.defineComponent(() => () => ( + + a dot + + )) + const ARender = Vue.defineComponent( + () => () => + renderPreload.value ? ( + + a render + + ) : null, + ) + const AExtra = Vue.defineComponent( + () => () => + extra.value ? ( + + a extra + + ) : null, + ) + const AGone = Vue.defineComponent( + () => () => + gone.value ? null : ( + + a gone + + ), + ) + const AList = Vue.defineComponent(() => () => ( + <> + {list.value.map((item) => ( + + {item} + + ))} + + )) + + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const layout = createRoute({ + getParentRoute: () => root, + id: '_layout', + component: () => ( + <> + + layout b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => layout, + path: '/a', + loaderDeps: ({ search }: { search: any }) => ({ x: search.x }), + loader: ({ deps }: { deps: { x: unknown } }) => { + aLoads.push(deps.x) + return gates.a?.promise + }, + component: () => ( + <> +

A page

+ + {aSelfSlot} + + + + a next + + + + + + + ), + }) + const b = createRoute({ + getParentRoute: () => layout, + path: '/b', + loader: async () => { + await gates.b?.promise + bAfterGate?.() + }, + component: () =>

B page

, + }) + const c = createRoute({ + getParentRoute: () => root, + path: '/c', + component: () =>

C page

, + }) + const items = createRoute({ + getParentRoute: () => root, + path: '/items/$id', + loader: () => gates.items?.promise, + component: () => ( + <> +

Items page

+ + item 1 + + + item 2 + + + ), + }) + + const router = createRouter({ + routeTree: root.addChildren([layout.addChildren([a, b]), c, items]), + history: createMemoryHistory({ initialEntries: [initial] }), + }) + + beforeRender?.(router) + render() + + const link = (id: string) => screen.getByTestId(id) + const isActive = (id: string) => + link(id).getAttribute('aria-current') === 'page' + const href = (id: string) => link(id).getAttribute('href') + + async function start(options: any) { + void router.navigate(options) + await tick() + } + + async function settle() { + await waitFor(() => expect(router.state.status).toBe('idle')) + } + + async function release(name: keyof Gates) { + const gate = gates[name]! + gates[name] = undefined + gate.resolve() + await gate.promise + await tick() + } + + return { + router, + gates, + counts, + aLoads, + nextFrom, + controls, + link, + isActive, + href, + start, + settle, + release, + } +} + +describe('links in a departing match', () => { + test('skip work at navigation start while staying links update urgently', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + expect(t.isActive('layout-b')).toBe(false) + + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + const list = t.counts.listUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + // Staying root and layout links update while the loader is pending. + expect(t.isActive('root-b')).toBe(true) + expect(t.isActive('layout-b')).toBe(true) + // The departing route's links do no work. + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.counts.listUpdater).toBe(list) + expect(t.isActive('a-self')).toBe(true) + + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('root-b')).toBe(true) + expect(t.router.state.status).toBe('idle') + }) + + test('staying route with changed params updates its links while pending', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + expect(t.isActive('item-1')).toBe(true) + expect(t.isActive('item-2')).toBe(false) + + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '2' } }) + expect(t.router.state.status).toBe('pending') + expect(t.isActive('item-1')).toBe(false) + expect(t.isActive('item-2')).toBe(true) + + await t.release('items') + await t.settle() + expect(t.isActive('item-2')).toBe(true) + }) + + test('a pending departure redirected back to the owner ends consistent', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/a', search: { x: 'back' } } as any) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-self')).toBe('/a') + + await t.release('b') + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=back') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=back') + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-dot')).toBe('/a') + expect(t.isActive('root-b')).toBe(false) + }) + + test('a pending departure superseded by a location that keeps the owner ends consistent', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + const updater = t.counts.aUpdater + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.counts.aUpdater).toBeGreaterThan(updater) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('links mounting or changing in a departing match build from its held location', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.href('a-dot')).toBe('/a') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + await t.controls.setHash('h') + await t.controls.setExtra(true) + // Both build from the location the rest of the match still presents. + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a') + expect(t.isActive('a-self')).toBe(true) + + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.isActive('a-extra')).toBe(true) + }) + + test('list churn in a departing match keeps building from its held location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + expect(t.href('a-list-one')).toBe('/a?x=one&item=one') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + const list = t.counts.listUpdater + await t.controls.setList(['two', 'three']) + expect(screen.queryByTestId('a-list-one')).toBeNull() + // Only the new link derives, from the held location. + expect(t.counts.listUpdater).toBe(list + 1) + expect(t.href('a-list-two')).toBe('/a?x=one&item=two') + expect(t.href('a-list-three')).toBe('/a?x=one&item=three') + + await t.release('b') + await screen.findByText('B page') + expect(t.counts.listUpdater).toBe(list + 1) + }) + + test('a pending navigation within the owner, then a departure, then back', async () => { + const t = setup() + await screen.findByText('A page') + + t.gates.a = deferred() + const firstA = t.gates.a + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.router.state.status).toBe('pending') + // Staying: updates while the owner's own loader is pending. + expect(t.href('a-self')).toBe('/a?x=one') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('root-b')).toBe(true) + + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('root-b')).toBe(false) + + firstA.resolve() + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('a departing link unmounted while pending does no further work', async () => { + const error = vi.spyOn(console, 'error') + const warn = vi.spyOn(console, 'warn') + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const gone = t.counts.goneUpdater + await t.start({ to: '/b' }) + await t.controls.setGone(true) + expect(screen.queryByTestId('a-gone')).toBeNull() + await t.release('b') + await screen.findByText('B page') + expect(t.counts.goneUpdater).toBe(gone) + expect(error).not.toHaveBeenCalled() + expect(warn).not.toHaveBeenCalled() + }) + + test.each([ + ['a-dot', '/a'], + ['a-next', '/a?x=one-next'], + ])( + 'clicking held link %s navigates to the href it displays', + async (id, displayed) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.router.state.status).toBe('pending') + expect(t.href(id)).toBe(displayed) + + await fireEvent.click(t.link(id)) + await tick() + expect(t.router.latestLocation.href).toBe(displayed) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe(displayed) + expect(screen.getByText('A page')).toBeInTheDocument() + }, + ) + + test.each(['mouseEnter', 'focus', 'touchStart'] as const)( + 'a %s preload of a held link loads the location it displays', + async (event) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + t.aLoads.length = 0 + + await fireEvent[event](t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['one-next']) + await t.release('b') + await screen.findByText('B page') + }, + ) + + test('a render preload of a link mounting in a departing match loads the location it displays', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.aLoads.length = 0 + + await t.controls.setRenderPreload(true) + await tick() + expect(t.href('a-render')).toBe('/a?x=one-render') + expect(t.aLoads).toEqual(['one-render']) + await t.release('b') + await screen.findByText('B page') + }) + + test('staying links click and preload from the live location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.a = deferred() + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.router.state.status).toBe('pending') + expect(t.href('a-next')).toBe('/a?x=two-next') + t.aLoads.length = 0 + + await fireEvent.mouseEnter(t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['two-next']) + await fireEvent.click(t.link('a-next')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + await t.release('a') + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a revisited route starts with fresh links, also ones mounting during its next departure', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + await t.release('b') + await screen.findByText('B page') + await t.settle() + + t.nextFrom.length = 0 + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await t.settle() + await tick() + // The remounted links never derive from the previous visit's location. + expect(t.nextFrom).not.toContain('one') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + // B is cached now: depart to a route that has not loaded yet. + t.gates.items = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/items/$id', params: { id: '1' } }) + expect(t.router.state.status).toBe('pending') + expect(t.counts.aUpdater).toBe(updater) + await t.controls.setExtra(true) + // The new link holds this visit's location, not the previous visit's. + expect(t.href('a-extra')).toBe('/a?x=two') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.isActive('root-b')).toBe(false) + + await fireEvent.click(t.link('a-extra')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two') + t.gates.items.resolve() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.isActive('a-extra')).toBe(true) + expect(t.href('a-next')).toBe('/a?x=two-next') + }) + + test('a document redirect from the destination does not break later navigations', async () => { + // jsdom reports the attempted document navigation as not implemented. + vi.spyOn(console, 'error').mockImplementation(() => {}) + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c', reloadDocument: true }) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await tick() + + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('a departure superseded by a history traversal back to the owner updates its links', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + t.router.history.go(-2) + await tick() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=one') + }) + + test('invalidating a pending departure keeps holding until it commits', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + void t.router.invalidate() + await tick() + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.counts.aUpdater).toBe(updater) + }) + + test('a departure redirected or superseded to another departing location does no work', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c' }) + }, + }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '1' } }) + // B redirects to C after being superseded; neither keeps A. + await t.release('b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + await t.release('items') + await screen.findByText('Items page') + expect(t.router.state.location.pathname).toBe('/items/1') + + await t.router.navigate({ to: '/a' }) + await screen.findByText('A page') + await tick() + const again = t.counts.aUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await screen.findByText('C page') + expect(t.counts.aUpdater).toBe(again) + }) + + test('a view transition callback that throws does not break later navigations', async () => { + vi.stubGlobal('CSS', { supports: () => true }) + ;(document as any).startViewTransition = (update: () => unknown) => { + update() + return { + updateCallbackDone: Promise.resolve(), + finished: Promise.resolve(), + } + } + const failures: Array = [] + const t = setup({ + // The history listener's load rejects with the callback's error. Record + // it instead of leaving it unhandled. + beforeRender: (router) => { + const load = router.load + router.load = (opts: any) => + load(opts).catch((error: unknown) => failures.push(error)) + }, + }) + await screen.findByText('A page') + await t.start({ + to: '/b', + viewTransition: { + types: () => { + throw new Error('types failed') + }, + }, + }) + await tick() + expect(failures.length).toBeGreaterThan(0) + delete (document as any).startViewTransition + vi.unstubAllGlobals() + + // A navigation that keeps the page updates its links. + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('links outside every match follow a pending navigation', async () => { + const t = setup() + await screen.findByText('A page') + cleanup() + const router = t.router + const InnerWrap = (_props: unknown, { slots }: Vue.SetupContext) => ( + <> + + wrap b + + {slots.default?.()} + + ) + router.update({ ...router.options, InnerWrap: InnerWrap as any }) + render() + await screen.findByText('A page') + expect(t.isActive('wrap-b')).toBe(false) + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(router.state.status).toBe('pending') + expect(t.isActive('wrap-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('wrap-b')).toBe(true) + }) +}) + +describe('pending and failing destinations', () => { + function setupPending(options: { throwFromP?: boolean } = {}) { + const gate: { p?: Deferred } = {} + const counts = { aUpdater: 0 } + const aNextSearch = (prev: any) => { + counts.aUpdater++ + return { x: `${prev.x}-next` } + } + const pendingSearch = (prev: any) => ({ y: `${prev.y}-pending` }) + const root = createRootRoute({ + component: () => ( + <> + + root p + + + + ), + errorComponent: () => ( + + error a + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + a next + + + ), + }) + const pRoute = createRoute({ + getParentRoute: () => root, + path: '/p', + validateSearch: (search: Record) => + search as { y?: string }, + loader: async () => { + await gate.p?.promise + if (options.throwFromP) { + throw new Error('p failed') + } + }, + pendingComponent: () => ( + + p pending + + ), + component: () =>

P page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, pRoute]), + history: createMemoryHistory({ initialEntries: ['/a?x=one'] }), + defaultPendingMs: 0, + defaultPendingMinMs: 0, + }) + render() + return { router, gate, counts } + } + + test('links in a pending component build from the destination and a return remounts fresh links', async () => { + const t = setupPending() + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p', search: { y: 'one' } }) + const pending = await screen.findByTestId('p-pending') + expect(t.counts.aUpdater).toBe(updater) + expect(pending).toHaveAttribute('href', '/p?y=one-pending') + expect(screen.getByTestId('root-p')).toHaveAttribute('aria-current', 'page') + + void t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + await tick() + expect(screen.getByTestId('a-next')).toHaveAttribute( + 'href', + '/a?x=two-next', + ) + expect(screen.getByTestId('root-p')).not.toHaveAttribute('aria-current') + t.gate.p.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + }) + + test('a departure that ends in an error leaves live links', async () => { + vi.spyOn(console, 'error').mockImplementation(() => {}) + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const t = setupPending({ throwFromP: true }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p' }) + await tick() + expect(t.counts.aUpdater).toBe(updater) + t.gate.p.resolve() + const errorLink = await screen.findByTestId('error-a') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + expect(t.router.state.location.pathname).toBe('/p') + expect(errorLink).toHaveAttribute('href', '/a') + expect(errorLink).not.toHaveAttribute('aria-current') + }) +}) + +describe('masked links in a departing match', () => { + test.each(['mask', 'routeMasks'] as const)( + 'clicking a held link with a location-dependent %s pushes the masked href it displays', + async (kind) => { + const root = createRootRoute() + const gate: { b?: Deferred } = {} + const photoSearch = (prev: any) => ({ id: prev.x }) + const mask = + kind === 'mask' + ? ({ to: '.', search: true, hash: true } as any) + : undefined + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + + masked + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: () => gate.b?.promise, + component: () =>

B page

, + }) + const photo = createRoute({ + getParentRoute: () => root, + path: '/photo', + component: () =>

Photo page

, + }) + const routeTree = root.addChildren([a, b, photo]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a?x=one#h'] }), + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/a', + search: true, + hash: true, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + gate.b = deferred() + void router.navigate({ to: '/b' }) + await tick() + expect(router.state.status).toBe('pending') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + await fireEvent.click(link) + await tick() + // The URL bar shows the masked href the link displayed. + expect(router.history.location.href).toBe('/a?x=one#h') + expect(router.latestLocation.pathname).toBe('/photo') + expect(router.latestLocation.search).toEqual({ id: 'one' }) + gate.b.resolve() + await screen.findByText('Photo page') + expect(router.history.location.href).toBe('/a?x=one#h') + }, + ) +}) + +describe('link location retention', () => { + setFlagsFromString('--expose-gc') + const gc: () => void = runInNewContext('gc') + async function collect() { + for (let round = 0; round < 3; round++) { + await tick() + gc() + } + } + const alive = (refs: Array>) => + refs.flatMap((ref, index) => (ref.deref() ? [index] : [])) + + // Builds and renders a router whose route `/a` and root render Links, and + // returns a function that visits a location with a large history state. + function renderApp() { + const sameSearch = (prev: any) => prev + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + a self + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return async (to: string, index: number) => { + await router.navigate({ + to, + search: { i: index }, + state: { payload: new Array(100_000).fill(index) } as any, + replace: true, + } as any) + await waitFor(() => expect(router.state.status).toBe('idle')) + await tick() + const location: any = router.state.location + return [new WeakRef(location), new WeakRef(location.state.payload)] + } + } + + test( + 'locations with large history state are collectable after their route is left', + { timeout: 20_000 }, + async () => { + const visit = renderApp() + await screen.findByText('A page') + // The router may keep its first navigation's state (also on main). + await visit('/a', 0) + const left: Array> = [] + for (let index = 1; index < 5; index++) { + left.push(...(await visit('/a', index))) + } + for (let index = 5; index < 9; index++) { + left.push(...(await visit('/b', index))) + } + await visit('/b', 9) + await screen.findByText('B page') + await collect() + // Only the current location (and its payload) stays reachable. + expect(alive(left)).toEqual([]) + }, + ) +}) + +describe('links after a same-href navigation that changes history state', () => { + function renderStateApp() { + // The `tag` state of every `/b` load, preloads included. + const bLoads: Array = [] + const root = createRootRoute({ component: () => }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + inherit + + ({ tag: `${prev.tag}-updated` }) as any} + data-testid="updater" + > + updater + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: ({ location }) => { + bLoads.push((location.state as any).tag) + }, + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return { router, bLoads } + } + + async function changeState(router: any) { + await screen.findByText('A page') + await router.navigate({ + to: '/a', + state: { tag: 'latest' } as any, + replace: true, + }) + expect(router.state.location.href).toBe('/a') + expect(router.state.location.state.tag).toBe('latest') + } + + test.each([ + ['inherit', 'latest'], + ['updater', 'latest-updated'], + ])( + 'clicking link %s derives its state from the latest location', + async (id, tag) => { + const { router } = renderStateApp() + await changeState(router) + + await fireEvent.click(screen.getByTestId(id)) + await screen.findByText('B page') + expect(router.state.location.pathname).toBe('/b') + expect((router.state.location.state as any).tag).toBe(tag) + }, + ) + + test('preloading derives its state from the latest location', async () => { + const { router, bLoads } = renderStateApp() + await changeState(router) + + await fireEvent.mouseEnter(screen.getByTestId('inherit')) + await waitFor(() => expect(bLoads).toEqual(['latest'])) + }) +}) diff --git a/packages/vue-router/tests/link-destination.test.tsx b/packages/vue-router/tests/link-destination.test.tsx new file mode 100644 index 0000000000..2615f07c58 --- /dev/null +++ b/packages/vue-router/tests/link-destination.test.tsx @@ -0,0 +1,236 @@ +import * as Vue from 'vue' +import { cleanup, fireEvent, render, screen } from '@testing-library/vue' +import { afterEach, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + defaultStringifySearch, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +/** + * Renders `links` in the root route next to `/source/$id`, `/target/$id` and + * `/visible/$id`. `builds()` counts the destination builds that stringify a + * search carrying a `build` key, so a reused location does not count. + */ +function setup(links: () => any, initial = '/source/one') { + const counted = vi.fn(defaultStringifySearch) + const root = createRootRoute({ + component: () => ( + <> + {links()} + + + ), + }) + const routes = ['/source/$id', '/target/$id', '/visible/$id'].map((path) => + createRoute({ getParentRoute: () => root, path }), + ) + const router = createRouter({ + routeTree: root.addChildren(routes), + history: createMemoryHistory({ initialEntries: [initial] }), + stringifySearch: (search) => + 'build' in search ? counted(search) : defaultStringifySearch(search), + }) + render() + const go = (id: string, extra?: object) => + router.navigate({ to: '/source/$id', params: { id }, ...extra } as any) + return { router, go, builds: () => counted.mock.calls.length } +} + +test('reuses a fixed destination across navigations', async () => { + const params = { id: 'fixed' } + const search = { build: 1 } + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + const initial = builds() + + await go('two') + await go('three', { hash: 'x' }) + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + expect(builds()).toBe(initial) + + await fireEvent.click(link) + await vi.waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) +}) + +test('rebuilds on a destination prop change, not a presentation prop change', async () => { + const id = Vue.ref('one') + const cls = Vue.ref('a') + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1') + id.value = 'two' + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?build=1') + await go('two') + await Vue.nextTick() + const settled = builds() + await go('three') + await Vue.nextTick() + expect(builds()).toBe(settled) + expect(link).toHaveAttribute('href', '/target/two?build=1') +}) + +test('reactive params and search follow in-place mutations at the next navigation', async () => { + const params = Vue.reactive({ id: 'one' }) + const search = Vue.reactive({ build: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1') + params.id = 'two' + search.build = 2 + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?build=2') + params.id = 'three' + await go('three') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/three?build=2') +}) + +test('does not re-read a reactive object nested inside a plain object', async () => { + // Only the prop value itself is checked for a reactive proxy (one level). + const filters = Vue.reactive({ page: 1 }) + const params = { id: 'fixed' } + const search = { build: 1, filters } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + const href = link.getAttribute('href') + filters.page = 2 + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', href!) +}) + +test('inherited params and search rebuild on every navigation', async () => { + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one') + await go('two', { search: { page: 2 } }) + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?page=2') +}) + +test('masked destinations follow their inputs', async () => { + const params = Vue.reactive({ id: 'one' }) + const fixed = { id: 'fixed' } + const mask = { to: '/visible/$id', params } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/visible/one') + params.id = 'two' + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/visible/two') +}) + +test('switches a mounted Link between plain and reactive inputs', async () => { + const live = Vue.ref(false) + const params = Vue.reactive({ id: 'one' }) + const plain = { id: 'fixed' } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed') + live.value = true + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/one') + params.id = 'two' + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two') + live.value = false + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed') +}) + +test('never mutates frozen caller options', async () => { + const params = Object.freeze({ id: 'fixed' }) + const search = Object.freeze({ build: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed?build=1') + expect(Object.keys(params)).toEqual(['id']) +}) + +test.each([ + ['inherited state', true], + ['a state updater', (prev: any) => ({ label: `${prev.label}!` })], +])( + 'a click after a same-href, state-only navigation uses the new state (%s)', + async (_, state) => { + const fixed = { id: 'fixed' } + const { router, go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + await go('one', { state: { label: 'next' } }) + await fireEvent.click(link) + await vi.waitFor(() => + expect(router.state.location.pathname).toBe('/target/fixed'), + ) + expect(router.state.location.state).toMatchObject({ + label: state === true ? 'next' : 'next!', + }) + }, +) diff --git a/packages/vue-router/tests/link.bench.tsx b/packages/vue-router/tests/link.bench.tsx index bf0c8ac56d..5a5b5f8752 100644 --- a/packages/vue-router/tests/link.bench.tsx +++ b/packages/vue-router/tests/link.bench.tsx @@ -1,7 +1,7 @@ /** @jsxImportSource vue */ import { render } from '@testing-library/vue' -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' import { getRouteSegments } from '@tanstack/router-core' import * as Vue from 'vue' import { @@ -83,9 +83,8 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - bench( - 'hardcoded href', - () => { + test('hardcoded href', async ({ bench }) => { + await bench('hardcoded href', () => { const links = Vue.h( 'div', null, @@ -96,13 +95,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'interpolate path', - () => { + test('interpolate path', async ({ bench }) => { + await bench('interpolate path', () => { const links = Vue.h( 'div', null, @@ -121,13 +120,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'build location', - () => { + test('build location', async ({ bench }) => { + await bench('build location', () => { const links = Vue.h( 'div', null, @@ -146,13 +145,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to absolute path', - () => { + test('link to absolute path', async ({ bench }) => { + await bench('link to absolute path', () => { const links = Vue.h( 'div', null, @@ -173,13 +172,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to relative path', - () => { + test('link to relative path', async ({ bench }) => { + await bench('link to relative path', () => { const links = Vue.h( 'div', null, @@ -202,13 +201,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to current path', - () => { + test('link to current path', async ({ bench }) => { + await bench('link to current path', () => { const links = Vue.h( 'div', null, @@ -229,7 +228,8 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) }) diff --git a/packages/vue-router/tests/link.test.tsx b/packages/vue-router/tests/link.test.tsx index 48fe82e2bb..bae8cf04f9 100644 --- a/packages/vue-router/tests/link.test.tsx +++ b/packages/vue-router/tests/link.test.tsx @@ -1547,10 +1547,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1606,10 +1609,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/app/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -7311,14 +7317,12 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', + // The links stay mounted across the navigation so they can turn active. + const rootRoute = createRootRoute({ component: () => { return ( <> -

Index Route

+ { ) }, }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, diff --git a/packages/vue-router/tests/setupTests.tsx b/packages/vue-router/tests/setupTests.tsx index c4c98142de..01050f2b52 100644 --- a/packages/vue-router/tests/setupTests.tsx +++ b/packages/vue-router/tests/setupTests.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { vi } from 'vitest' // For @testing-library to work properly with Vue tests diff --git a/packages/vue-router/tests/useBlocker.test.tsx b/packages/vue-router/tests/useBlocker.test.tsx index f22a7a930f..ca4d8fb352 100644 --- a/packages/vue-router/tests/useBlocker.test.tsx +++ b/packages/vue-router/tests/useBlocker.test.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { afterEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/vue' diff --git a/packages/vue-router/tests/useNavigate.test.tsx b/packages/vue-router/tests/useNavigate.test.tsx index 9ab77ac690..7ffdb64c32 100644 --- a/packages/vue-router/tests/useNavigate.test.tsx +++ b/packages/vue-router/tests/useNavigate.test.tsx @@ -1,5 +1,4 @@ import * as Vue from 'vue' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test } from 'vitest' import { cleanup, diff --git a/packages/vue-router/vite.config.ts b/packages/vue-router/vite.config.ts index 88949476fa..13928e0a1a 100644 --- a/packages/vue-router/vite.config.ts +++ b/packages/vue-router/vite.config.ts @@ -24,7 +24,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, - setupFiles: ['./tests/setupTests.tsx'], + setupFiles: ['./tests/jest-dom.setup.ts', './tests/setupTests.tsx'], }, }) diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index eaf98f2385..334da56ce7 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,59 @@ # @tanstack/vue-start-client +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/start-client-core@1.170.39 + - @tanstack/vue-router@1.170.42 + +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/start-client-core@1.170.38 + - @tanstack/vue-router@1.170.41 + +## 1.167.43 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + - @tanstack/start-client-core@1.170.37 + - @tanstack/vue-router@1.170.40 + +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-client-core@1.170.36 + - @tanstack/vue-router@1.170.39 + +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-client-core@1.170.35 + +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/vue-router@1.170.37 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + ## 1.167.39 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 7f5a621dfb..74b8016924 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.39", + "version": "1.167.45", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index d5a4218807..0963c82fe8 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,72 @@ # @tanstack/vue-start-server +## 1.167.50 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/start-server-core@1.169.45 + - @tanstack/vue-router@1.170.42 + +## 1.167.49 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/start-server-core@1.169.44 + - @tanstack/vue-router@1.170.41 + +## 1.167.48 + +### Patch Changes + +- Updated dependencies [[`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08)]: + - @tanstack/start-server-core@1.169.43 + +## 1.167.47 + +### Patch Changes + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-server-core@1.169.42 + - @tanstack/router-core@1.171.37 + - @tanstack/vue-router@1.170.40 + +## 1.167.46 + +### Patch Changes + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Remove the built-in `useSession` API. Applications choose a session library, such as iron-session, and save or destroy sessions explicitly before returning or redirecting. Connect a cookie adapter through `getCookie` and `setCookie`, or append serialized cookies with `appendResponseHeader('set-cookie', cookie)`. Existing session cookies require a deliberate migration or signing in again with a new cookie name. + + `createServerEntry` keeps the complete callback, including custom error handling, inside the request context and converts errors that escape it. The built-in entry still converts errors automatically. Raw `createStartHandler` handlers now rethrow the original error. For custom reporting, catch inside `createServerEntry`, then rethrow for default conversion or return `handleStartError(error)` to preserve response-helper status, headers, and cookies. Return an explicit `Response` when choosing a custom error payload. + + Response helpers now apply consistently across server routes, SSR, server functions, redirects, errors, and middleware response replacements. Helper setters override returned values; cookie helpers preserve independent cookies and replace matching cookie identities. Use `appendResponseHeader('set-cookie', cookie)` when adding a serialized cookie without replacing other cookies. Changed responses receive copied headers and reuse the body stream, so applications should inspect the response returned by Start rather than relying on mutation of the original response. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-server-core@1.169.41 + - @tanstack/vue-router@1.170.39 + +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-server-core@1.169.40 + +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/vue-router@1.170.37 + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + ## 1.167.43 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index a0dd73bfc4..4fc4c1c9fd 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.43", + "version": "1.167.50", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 60b7289a42..2e781d8694 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,122 @@ # @tanstack/vue-start +## 1.169.6 + +### Patch Changes + +- Updated dependencies [[`3f22686`](https://github.com/TanStack/router/commit/3f226869e0af211ff7f1de5d7343e43462dbb101), [`559c7de`](https://github.com/TanStack/router/commit/559c7ded6e2a6eeda3f91c80d8c03f4cfeb9a206)]: + - @tanstack/start-plugin-core@1.171.57 + +## 1.169.5 + +### Patch Changes + +- [#8863](https://github.com/TanStack/router/pull/8863) [`01fab5a`](https://github.com/TanStack/router/commit/01fab5a6c8aed70d61d82c64bc344cbac66c240c) - The Rsbuild plugin keeps the app's `server.compress` setting instead of always setting it to `false`. Compression stays off by default: a compressed streamed page reaches the browser only once the stream ends. The optional `@rsbuild/core` peer is now `^2.0.5`, the first version whose compression keeps SSR response headers intact. + +- [#8869](https://github.com/TanStack/router/pull/8869) [`d05c6c6`](https://github.com/TanStack/router/commit/d05c6c66e7efc659286f37a56b3b1d4d267139e7) - Vite dev: Vue Start pre-bundles `@tanstack/vue-router > @tanstack/vue-store`, as React Start does for `@tanstack/react-store`. The first page load on a cold dependency cache no longer re-optimizes `vue` and reloads the page. + +- Updated dependencies [[`01fab5a`](https://github.com/TanStack/router/commit/01fab5a6c8aed70d61d82c64bc344cbac66c240c), [`c5320d7`](https://github.com/TanStack/router/commit/c5320d7ca23eca82d720ac5629d2bad5cf7d9b02), [`545a8d3`](https://github.com/TanStack/router/commit/545a8d3790989ca502153c3292c6b1e8063257f4), [`da8c28c`](https://github.com/TanStack/router/commit/da8c28c498230a5730ce75b2693baeeb3ef68ac1)]: + - @tanstack/start-plugin-core@1.171.56 + +## 1.169.4 + +### Patch Changes + +- [#8670](https://github.com/TanStack/router/pull/8670) [`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c) - Reference agent skills in other packages by their `intent load` identifier (`@tanstack/#`) instead of relative file links that break once packages are installed. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`ed55775`](https://github.com/TanStack/router/commit/ed5577593a749b8c7193cc7b5d945fd084bfac2f), [`63a886d`](https://github.com/TanStack/router/commit/63a886da9040c4b039ea3bf5b3a841771375cddb), [`d9b07e8`](https://github.com/TanStack/router/commit/d9b07e8d3b724cdbfac0aa2fba4c1f7a3a241100)]: + - @tanstack/start-client-core@1.170.39 + - @tanstack/start-server-core@1.169.45 + - @tanstack/vue-router@1.170.42 + - @tanstack/start-plugin-core@1.171.55 + - @tanstack/vue-start-client@1.167.45 + - @tanstack/vue-start-server@1.167.50 + +## 1.169.3 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/start-server-core@1.169.44 + - @tanstack/start-client-core@1.170.38 + - @tanstack/start-plugin-core@1.171.54 + - @tanstack/vue-router@1.170.41 + - @tanstack/vue-start-client@1.167.44 + - @tanstack/vue-start-server@1.167.49 + +## 1.169.2 + +### Patch Changes + +- Updated dependencies [[`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08), [`fdc10fa`](https://github.com/TanStack/router/commit/fdc10fa13fbac758615f9a3d37075088d1cc1e1f)]: + - @tanstack/start-server-core@1.169.43 + - @tanstack/start-plugin-core@1.171.53 + - @tanstack/vue-start-server@1.167.48 + +## 1.169.1 + +### Patch Changes + +- Updated dependencies [[`740b0ce`](https://github.com/TanStack/router/commit/740b0ce17737d1f7398740136acdbeabe80df7d8), [`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/start-server-core@1.169.42 + - @tanstack/start-plugin-core@1.171.52 + - @tanstack/vue-start-server@1.167.47 + - @tanstack/start-client-core@1.170.37 + - @tanstack/vue-router@1.170.40 + - @tanstack/vue-start-client@1.167.43 + +## 1.169.0 + +### Minor Changes + +- [#8696](https://github.com/TanStack/router/pull/8696) [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae) - TanStack Start is stable. To upgrade from a release candidate, follow [Migrate from the Release Candidate](https://tanstack.com/start/latest/docs/framework/react/migrate-from-release-candidate). + +### Patch Changes + +- [#8694](https://github.com/TanStack/router/pull/8694) [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549) - Remove the deprecated `.inputValidator()` from `createServerFn` and `createMiddleware`. Use `.validator()`, which takes the same validator. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Keep streaming a page when request middleware returns a response that reads the page body, such as a copy made through a wrapped global `Response`, a copy in Bun, or a body piped through a transform. Start now disposes a replaced page stream only when nothing reads it. `transferResponseBodyOwnership` is removed: return the derived response directly. + +- [#7588](https://github.com/TanStack/router/pull/7588) [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5) - Remove the built-in `useSession` API. Applications choose a session library, such as iron-session, and save or destroy sessions explicitly before returning or redirecting. Connect a cookie adapter through `getCookie` and `setCookie`, or append serialized cookies with `appendResponseHeader('set-cookie', cookie)`. Existing session cookies require a deliberate migration or signing in again with a new cookie name. + + `createServerEntry` keeps the complete callback, including custom error handling, inside the request context and converts errors that escape it. The built-in entry still converts errors automatically. Raw `createStartHandler` handlers now rethrow the original error. For custom reporting, catch inside `createServerEntry`, then rethrow for default conversion or return `handleStartError(error)` to preserve response-helper status, headers, and cookies. Return an explicit `Response` when choosing a custom error payload. + + Response helpers now apply consistently across server routes, SSR, server functions, redirects, errors, and middleware response replacements. Helper setters override returned values; cookie helpers preserve independent cookies and replace matching cookie identities. Use `appendResponseHeader('set-cookie', cookie)` when adding a serialized cookie without replacing other cookies. Changed responses receive copied headers and reuse the body stream, so applications should inspect the response returned by Start rather than relying on mutation of the original response. + +- [#8696](https://github.com/TanStack/router/pull/8696) [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae) - Require Vite 8 for Vite builds. Vite 7 is no longer supported. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`550f478`](https://github.com/TanStack/router/commit/550f47881070c0558a87e1acce7f38fbc85b9549), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f3d7ee3`](https://github.com/TanStack/router/commit/f3d7ee3374c660e0fe82a03ac580a90ed2e2fa98), [`4104b8e`](https://github.com/TanStack/router/commit/4104b8ef11498706b5059c5a915f2ae47ffbc5ba), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`f243c61`](https://github.com/TanStack/router/commit/f243c61e95dae64fe04da4499c0c4ec44f26abae), [`19524cc`](https://github.com/TanStack/router/commit/19524ccdd75870ce1db2f324518eeb3f23cc0f97)]: + - @tanstack/start-server-core@1.169.41 + - @tanstack/start-client-core@1.170.36 + - @tanstack/start-plugin-core@1.171.51 + - @tanstack/vue-start-server@1.167.46 + - @tanstack/vue-router@1.170.39 + - @tanstack/vue-start-client@1.167.42 + +## 1.168.57 + +### Patch Changes + +- Updated dependencies [[`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb)]: + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-server-core@1.169.40 + - @tanstack/start-client-core@1.170.35 + - @tanstack/vue-start-client@1.167.41 + - @tanstack/vue-start-server@1.167.45 + +## 1.168.56 + +### Patch Changes + +- Updated dependencies [[`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/vue-router@1.170.37 + - @tanstack/start-server-core@1.169.39 + - @tanstack/vue-start-client@1.167.40 + - @tanstack/vue-start-server@1.167.44 + - @tanstack/start-client-core@1.170.34 + ## 1.168.55 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 8b46cc8448..bf6b79e636 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.55", + "version": "1.169.6", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", @@ -135,8 +135,8 @@ "rimraf": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.0", - "vite": ">=7.0.0", + "@rsbuild/core": "^2.0.5", + "vite": ">=8.0.0", "vue": "^3.3.0" }, "peerDependenciesMeta": { diff --git a/packages/vue-start/skills/vue-start/SKILL.md b/packages/vue-start/skills/vue-start/SKILL.md index 63ccc0ab21..3a32dc169a 100644 --- a/packages/vue-start/skills/vue-start/SKILL.md +++ b/packages/vue-start/skills/vue-start/SKILL.md @@ -18,7 +18,7 @@ sources: # Vue Start (`@tanstack/vue-start`) -This skill builds on start-core. Read [start-core](../../../start-client-core/skills/start-core/SKILL.md) first for foundational concepts. +This skill builds on start-core. Read `@tanstack/start-client-core#start-core` first for foundational concepts. This skill covers the Vue-specific bindings, setup, and patterns for TanStack Start. @@ -36,7 +36,7 @@ This skill covers the Vue-specific bindings, setup, and patterns for TanStack St All core APIs (`createServerFn`, `createMiddleware`, `createStart`, `createIsomorphicFn`, `createServerOnlyFn`, `createClientOnlyFn`) are available from `@tanstack/vue-start`. -Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCookie`, `getCookie`, `useSession`) are imported from `@tanstack/vue-start/server`. +Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCookie`, `getCookie`) are imported from `@tanstack/vue-start/server`. ## Full Project Setup @@ -303,6 +303,6 @@ function RootComponent() { ## Cross-References -- [start-core](../../../start-client-core/skills/start-core/SKILL.md) — core Start concepts -- [router-core](../../../router-core/skills/router-core/SKILL.md) — routing fundamentals -- [vue-router](../../../vue-router/skills/vue-router/SKILL.md) — Vue Router composables and components +- `@tanstack/start-client-core#start-core` — core Start concepts +- `@tanstack/router-core#router-core` — routing fundamentals +- `@tanstack/vue-router#vue-router` — Vue Router composables and components diff --git a/packages/vue-start/src/default-entry/server.ts b/packages/vue-start/src/default-entry/server.ts index 5729a469d3..c716a7ac14 100644 --- a/packages/vue-start/src/default-entry/server.ts +++ b/packages/vue-start/src/default-entry/server.ts @@ -1,6 +1,7 @@ import { createStartHandler, defaultStreamHandler, + createServerEntry as createCoreServerEntry, } from '@tanstack/vue-start/server' import type { Register } from '@tanstack/vue-router' import type { RequestHandler } from '@tanstack/vue-start/server' @@ -10,12 +11,8 @@ const fetch = createStartHandler(defaultStreamHandler) // Providing `RequestHandler` from `@tanstack/vue-start/server` is required so that the output types don't import it from `@tanstack/start-server-core` export type ServerEntry = { fetch: RequestHandler } -export function createServerEntry(entry: ServerEntry): ServerEntry { - return { - async fetch(...args) { - return await entry.fetch(...args) - }, - } -} +// Bind the shared request context and fallback error handling to Vue's Register. +export const createServerEntry: (entry: ServerEntry) => ServerEntry = + createCoreServerEntry export default createServerEntry({ fetch }) diff --git a/packages/vue-start/src/plugin/vite.ts b/packages/vue-start/src/plugin/vite.ts index 4af970a088..d257ce7256 100644 --- a/packages/vue-start/src/plugin/vite.ts +++ b/packages/vue-start/src/plugin/vite.ts @@ -39,6 +39,14 @@ export function tanstackStart( '@tanstack/vue-router', '@tanstack/start-static-server-functions', ], + include: [ + // `@tanstack/vue-router` is excluded, so the scanner never + // sees its `@tanstack/vue-store` import; discovered while + // crawling, it imports `vue` and re-chunks the already + // optimized `vue`, which forces a full page reload on + // every cold start (and loses an in-flight page load). + '@tanstack/vue-router > @tanstack/vue-store', + ], } : undefined, } diff --git a/packages/zod-adapter/tests/index.test.tsx b/packages/zod-adapter/tests/index.test.tsx index d59ec207fc..36abe0f239 100644 --- a/packages/zod-adapter/tests/index.test.tsx +++ b/packages/zod-adapter/tests/index.test.tsx @@ -9,7 +9,6 @@ import { RouterProvider, } from '@tanstack/react-router' import { cleanup, fireEvent, render, screen } from '@testing-library/react' -import '@testing-library/jest-dom/vitest' afterEach(() => { vi.resetAllMocks() diff --git a/packages/zod-adapter/tests/jest-dom.setup.ts b/packages/zod-adapter/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/zod-adapter/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/zod-adapter/vite.config.ts b/packages/zod-adapter/vite.config.ts index 8c8c0c519f..8d553e0a59 100644 --- a/packages/zod-adapter/vite.config.ts +++ b/packages/zod-adapter/vite.config.ts @@ -9,6 +9,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 393afb1b75..4328f4fab6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,3 +1,161 @@ +--- +lockfileVersion: '9.0' + +importers: + + .: + configDependencies: {} + packageManagerDependencies: + pnpm: + specifier: 12.18.0 + version: 12.18.0 + +packages: + + '@pnpm/exe.android-arm64@12.18.0': + resolution: {integrity: sha512-fOF6IwgvnUKEmVedGqiAsNPfN2Ry8GvaqzSQOiF3RJFbpBfPKO/6YT54s1GjToyYinRxw9preHHPe4y2N3SzhA==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.18.0': + resolution: {integrity: sha512-6OiolnaCsB3/GcJ9XNrenbUH3zFHRJ+5QynrMUUEyThbgnnCzWxa199hpQlOmxN4rAXuYQ0IYgWFNUZxyzg31Q==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.18.0': + resolution: {integrity: sha512-zkq+4YzVIX39ETYLyC3W7LY7MpHEU/J3nRhHl4i2yPld2Cf2+rEKRh3ejJ4AmaQ77HHJLCktY4Z3jq0fpcxFXg==} + cpu: [arm64] + os: [darwin] + + '@pnpm/exe.darwin-x64@12.18.0': + resolution: {integrity: sha512-qMsL9qx92unOTa6hgkfiTJv8ceZaTx0IQg7InhYDVX2ZrTECujaVEEVypnJK5m3eGUsP1KD7Y4qIgleCwfRsYw==} + cpu: [x64] + os: [darwin] + + '@pnpm/exe.freebsd-x64@12.18.0': + resolution: {integrity: sha512-/9vy/4ms52cU4MjZ5NhHd6N2d9L9W0kARf5/ff2tweAHu0VeUzs/0qp/7ZHFuddm2Wa/m0AKQoPum9AVUCqKsw==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.18.0': + resolution: {integrity: sha512-Vp+TIMPPyackVCXkOdEKH/RmAn/r07EcIyrgZYQK7VrkksqZOie0GnWIx+85mPqeFEYCRtXIZAFJ9L4ceTndDg==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-arm64@12.18.0': + resolution: {integrity: sha512-2dpyVBCHT+FfpuQh9i+7MXAqNWYLCvD5vYr5p6Eimxoga8USLnjbUgyj72AOrO0hjc5ri3TEFP3jiyBHjkSZpQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-ppc64@12.18.0': + resolution: {integrity: sha512-BBOOOfNJ2QwIIya3eKqOjiN4WNTszfRz7HCvw9XggcT7+ftMjNP8XJ/GfW+ltCBeUFR9d8WBVsr2m/NLjX2CZQ==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.18.0': + resolution: {integrity: sha512-7kMN77xSOYJX8GPSH5RbNAc5oM61LMmcSUukDDUwllnZPXm8GRPskCNsTWy8SCw01Kr1FB+5SwGNMiTdiziLNQ==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.18.0': + resolution: {integrity: sha512-htuSCpEcmDzhKoJqXbPkvfr176dBHU0QIF5mWcRiqxRXAB/1JoYiMYotfjWpk+ztgpB9qlx4XnWlLFAf7gzc6g==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.18.0': + resolution: {integrity: sha512-Uj+vzfIQ62kDP10x36yHZIXVs5ohdNtiPYwn5FhCLlNScHPo0OAI+ShGDtLofiBXKE7umu71Jmjm7N8a8zVcDw==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-x64@12.18.0': + resolution: {integrity: sha512-OJ+X2wcraldCwj75pCIerWARQSRpdfj0eBTs/2ODyhfeW46ylOnjTIE/GKra6Mn6E72/gBmXS8igrUioa+F9fQ==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.win32-arm64@12.18.0': + resolution: {integrity: sha512-wEY6jiACGcbhhi5yD59doHqNTndS7AaujaPmtWAu1DKkHru2hy5fJ9yUGecW72Ypaw2/I3BEprfMOopap2NQtw==} + cpu: [arm64] + os: [win32] + + '@pnpm/exe.win32-x64@12.18.0': + resolution: {integrity: sha512-5FJkghO7RLRkQpWxeVEygW9XsmnNuxzPfXbgwFWCHsFyFhpDn/vOdL88ToQEM0Kt5igdW5s6U0/IDH8Dvkt3pg==} + cpu: [x64] + os: [win32] + + pnpm@12.18.0: + resolution: {integrity: sha512-nXiC1dyCFH7PxOBiqjSDTgrQKWcQoYN6ERWuASEn02txCeMhrBWYod0KZVl2gbHpmRfhLtDXSerpEYeUM2O+sw==} + engines: {node: '>=18'} + hasBin: true + +snapshots: + + '@pnpm/exe.android-arm64@12.18.0': + optional: true + + '@pnpm/exe.android-x64@12.18.0': + optional: true + + '@pnpm/exe.darwin-arm64@12.18.0': + optional: true + + '@pnpm/exe.darwin-x64@12.18.0': + optional: true + + '@pnpm/exe.freebsd-x64@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64@12.18.0': + optional: true + + '@pnpm/exe.linux-ppc64@12.18.0': + optional: true + + '@pnpm/exe.linux-riscv64@12.18.0': + optional: true + + '@pnpm/exe.linux-s390x@12.18.0': + optional: true + + '@pnpm/exe.linux-x64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-x64@12.18.0': + optional: true + + '@pnpm/exe.win32-arm64@12.18.0': + optional: true + + '@pnpm/exe.win32-x64@12.18.0': + optional: true + + pnpm@12.18.0: + optionalDependencies: + '@pnpm/exe.android-arm64': 12.18.0 + '@pnpm/exe.android-x64': 12.18.0 + '@pnpm/exe.darwin-arm64': 12.18.0 + '@pnpm/exe.darwin-x64': 12.18.0 + '@pnpm/exe.freebsd-x64': 12.18.0 + '@pnpm/exe.linux-arm64': 12.18.0 + '@pnpm/exe.linux-arm64-musl': 12.18.0 + '@pnpm/exe.linux-ppc64': 12.18.0 + '@pnpm/exe.linux-riscv64': 12.18.0 + '@pnpm/exe.linux-s390x': 12.18.0 + '@pnpm/exe.linux-x64': 12.18.0 + '@pnpm/exe.linux-x64-musl': 12.18.0 + '@pnpm/exe.win32-arm64': 12.18.0 + '@pnpm/exe.win32-x64': 12.18.0 + +--- lockfileVersion: '9.0' settings: @@ -19,26 +177,26 @@ catalogs: specifier: ^1.26.2 version: 1.26.2 '@rsbuild/core': - specifier: ^2.2.5 - version: 2.2.5 + specifier: ^2.3.1 + version: 2.3.1 '@tanstack/vite-config': specifier: 0.5.2 version: 0.5.2 '@testing-library/jest-dom': - specifier: ^6.6.3 - version: 6.6.3 + specifier: ^7.0.1 + version: 7.0.1 '@testing-library/react': specifier: ^16.2.0 version: 16.3.0 '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.7.0 + specifier: ^6.0.1 + version: 6.0.1 '@vitejs/plugin-vue-jsx': specifier: ^4.1.2 version: 4.2.0 '@vitest/ui': - specifier: ^4.1.4 - version: 4.1.4 + specifier: ^5.0.4 + version: 5.0.4 chokidar: specifier: ^5.0.0 version: 5.0.0 @@ -73,8 +231,8 @@ catalogs: specifier: 2.11.10 version: 2.11.10 vitest: - specifier: ^4.1.4 - version: 4.1.4 + specifier: ^5.0.4 + version: 5.0.4 vue: specifier: ^3.5.25 version: 3.5.25 @@ -86,12 +244,12 @@ overrides: '@types/babel__traverse': ^7.28.0 vite-plugin-dts: 4.2.3 solid-js: 1.9.12 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 eslint: ^9.22.0 - vite: ^8.0.14 + vite: ^8.3.4 '@types/node': 25.0.9 '@playwright/test': ^1.63.0 '@tanstack/query-core': ^5.102.0 @@ -136,7 +294,6 @@ overrides: '@tanstack/eslint-plugin-router': workspace:* '@tanstack/router-utils': workspace:* '@tanstack/start-static-server-functions': workspace:* - '@tanstack/nitro-v2-vite-plugin': workspace:* importers: @@ -149,17 +306,17 @@ importers: specifier: ^2.30.0 version: 2.30.0(@types/node@25.0.9) '@nx/devkit': - specifier: 23.2.0 - version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) + specifier: 24.0.0 + version: 24.0.0(nx@24.0.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2))(@swc/core@1.15.33(@swc/helpers@0.5.23))) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@swc-node/register': specifier: ^1.11.1 - version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + version: 1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2) '@tanstack/eslint-config': specifier: 0.4.0 - version: 0.4.0(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) + version: 0.4.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -168,16 +325,16 @@ importers: version: typescript@7.0.2 eslint: specifier: ^9.22.0 - version: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-plugin-unused-imports: specifier: ^4.1.4 - version: 4.1.4(@typescript-eslint/eslint-plugin@8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) + version: 4.1.4(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) markdown-link-extractor: specifier: ^4.0.3 version: 4.0.3 nx: - specifier: 23.2.0 - version: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + specifier: 24.0.0 + version: 24.0.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2))(@swc/core@1.15.33(@swc/helpers@0.5.23)) prettier: specifier: ^3.8.0 version: 3.8.1 @@ -200,14 +357,14 @@ importers: specifier: npm:typescript@5.9 version: typescript@5.9.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) benchmarks/bundle-size: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../packages/react-router @@ -230,11 +387,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -243,11 +400,11 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../packages/router-plugin @@ -262,22 +419,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/client-nav: dependencies: @@ -297,11 +454,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -310,8 +467,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) + specifier: ^6.0.1 + version: 6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@6.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@5.0.4) '@platformatic/flame': specifier: ^1.6.0 version: 1.6.0 @@ -320,7 +477,7 @@ importers: version: link:../../packages/router-plugin '@testing-library/react': specifier: ^16.2.0 - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/jsdom': specifier: 28.0.0 version: 28.0.0 @@ -335,13 +492,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: ^29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -349,14 +506,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/memory/client: dependencies: @@ -373,11 +530,11 @@ importers: specifier: workspace:* version: link:../../../packages/vue-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -386,8 +543,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) + specifier: ^6.0.1 + version: 6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@6.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@5.0.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -396,7 +553,7 @@ importers: version: 1.6.0 '@testing-library/react': specifier: ^16.2.0 - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/jsdom': specifier: 28.0.0 version: 28.0.0 @@ -411,13 +568,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -425,14 +582,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/memory/server: dependencies: @@ -455,11 +612,11 @@ importers: specifier: workspace:* version: link:../../../packages/vue-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -468,8 +625,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) + specifier: ^6.0.1 + version: 6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@6.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@5.0.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -484,10 +641,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -495,14 +652,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/ssr: dependencies: @@ -525,11 +682,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -538,8 +695,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) + specifier: ^6.0.1 + version: 6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@6.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@5.0.4) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -548,10 +705,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -562,14 +719,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/e2e-utils: devDependencies: @@ -583,14 +740,14 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/eslint-plugin-start: devDependencies: @@ -616,14 +773,14 @@ importers: specifier: ^9.22.0 version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 typescript: specifier: ^5.7.2 version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/react-router/basepath-file-based: dependencies: @@ -637,11 +794,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -657,16 +814,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -674,17 +831,20 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 tailwindcss: specifier: ^4.2.2 version: 4.2.2 + zod: + specifier: 'catalog:' + version: 4.5.4 devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -700,10 +860,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-esbuild-file-based: dependencies: @@ -717,11 +877,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -749,7 +909,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -760,11 +920,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -789,19 +949,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-file-based-code-splitting: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -812,11 +972,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -841,22 +1001,22 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -864,11 +1024,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -890,22 +1050,22 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -916,11 +1076,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -945,16 +1105,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -963,13 +1123,13 @@ importers: version: link:../../../packages/react-router-devtools '@tanstack/react-virtual': specifier: ^3.13.0 - version: 3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -991,19 +1151,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: ~5.9.0 version: 5.9.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1017,11 +1177,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1046,16 +1206,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-virtual-named-export-config-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1069,11 +1229,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1098,10 +1258,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/escaped-special-strings: dependencies: @@ -1112,11 +1272,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -1132,16 +1292,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/generator-cli-only: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1152,11 +1312,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-cli react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1178,25 +1338,25 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1227,13 +1387,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-4759: dependencies: @@ -1241,11 +1401,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -1261,10 +1421,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-7120: dependencies: @@ -1275,11 +1435,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -1295,16 +1455,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-7457: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1312,11 +1472,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -1332,16 +1492,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/js-only-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1349,11 +1509,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1378,10 +1538,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/match-params: dependencies: @@ -1389,11 +1549,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -1408,8 +1568,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/react-compiler: dependencies: @@ -1417,11 +1577,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@babel/core': specifier: ^7.29.0 @@ -1431,7 +1591,7 @@ importers: version: 1.63.0 '@rolldown/plugin-babel': specifier: ^0.2.0 - version: 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1443,13 +1603,13 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: specifier: ^1.0.0 version: 1.0.0 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/rspack-basic-file-based: dependencies: @@ -1460,11 +1620,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1473,11 +1633,11 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1515,11 +1675,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1528,11 +1688,11 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1568,7 +1728,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1579,11 +1739,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1608,16 +1768,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/sentry-integration: dependencies: '@sentry/react': specifier: ^10.32.0 - version: 10.32.0(react@19.2.3) + version: 10.32.0(react@19.2.9) '@sentry/tracing': specifier: ^7.120.4 version: 7.120.4 @@ -1626,7 +1786,7 @@ importers: version: 4.6.1(supports-color@10.2.2) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1634,11 +1794,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1660,16 +1820,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1680,11 +1840,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1712,13 +1872,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic: dependencies: @@ -1737,15 +1897,18 @@ importers: http-proxy-middleware: specifier: ^3.0.5 version: 3.0.5(supports-color@10.2.2) + iron-session: + specifier: ^9.0.1 + version: 9.0.1 js-cookie: specifier: ^3.0.5 version: 3.0.5 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1757,17 +1920,17 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1788,13 +1951,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1802,8 +1965,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -1818,7 +1981,7 @@ importers: version: 7.0.0 '@prisma/client': specifier: ^7.0.0 - version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1828,12 +1991,15 @@ importers: '@tanstack/react-start': specifier: workspace:* version: link:../../../packages/react-start + iron-session: + specifier: ^9.0.1 + version: 9.0.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1846,7 +2012,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1864,13 +2030,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) dotenv: specifier: ^17.2.3 version: 17.2.3 prisma: specifier: ^7.0.0 - version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1878,8 +2044,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-cloudflare: dependencies: @@ -1893,21 +2059,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1925,7 +2091,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1933,8 +2099,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -1943,10 +2109,10 @@ importers: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1960,11 +2126,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1980,7 +2146,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1998,10 +2164,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2009,8 +2175,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-tsr-config: dependencies: @@ -2021,11 +2187,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -2046,20 +2212,20 @@ importers: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/clerk-basic: dependencies: '@clerk/tanstack-react-start': specifier: ^0.19.0 - version: 0.19.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.19.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2070,11 +2236,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -2087,7 +2253,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2105,7 +2271,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2113,8 +2279,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/csp: dependencies: @@ -2125,11 +2291,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2150,14 +2316,14 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-inline: dependencies: @@ -2171,24 +2337,24 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2206,13 +2372,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-modules: dependencies: @@ -2223,18 +2389,27 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 + '@rsbuild/core': + specifier: ^2.3.1 + version: 2.3.1 + '@rsbuild/plugin-react': + specifier: ^2.0.0 + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) + '@rsbuild/plugin-sass': + specifier: ^2.0.1 + version: 2.0.1(@rsbuild/core@2.3.1) '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -2252,22 +2427,28 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + cf: + specifier: 1.0.0-beta.28 + version: 1.0.0-beta.28(@types/node@25.0.9) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta + rsbuild-plugin-cloudflare: + specifier: ^0.0.4 + version: 0.0.4(@rsbuild/core@2.3.1)(@types/node@25.0.9)(workerd@1.20261104.1) sass: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -2287,11 +2468,11 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -2301,7 +2482,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2322,13 +2503,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) cross-env: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2339,8 +2520,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/custom-server-rsbuild: dependencies: @@ -2354,21 +2535,21 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2394,8 +2575,8 @@ importers: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2415,18 +2596,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2444,16 +2625,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/dev-ssr-styles: dependencies: @@ -2464,11 +2645,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2493,19 +2674,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -2519,11 +2700,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2548,13 +2729,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) node-forge: specifier: ^1.3.1 version: 1.3.1 srvx: - specifier: 0.11.15 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 tsx: specifier: 4.20.3 version: 4.20.3 @@ -2562,8 +2743,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/flamegraph-bench: dependencies: @@ -2574,14 +2755,14 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 devDependencies: '@platformatic/flame': specifier: latest @@ -2591,7 +2772,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) autocannon: specifier: ^8.0.0 version: 8.0.0 @@ -2599,14 +2780,14 @@ importers: specifier: 9.2.1 version: 9.2.1 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/hmr: dependencies: @@ -2617,27 +2798,27 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2655,7 +2836,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2663,8 +2844,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/i18n-paraglide: dependencies: @@ -2678,11 +2859,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@inlang/paraglide-js': specifier: ^2.4.0 @@ -2692,7 +2873,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2710,7 +2891,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2718,8 +2899,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection: dependencies: @@ -2730,24 +2911,24 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) react-tweet: specifier: ^3.3.0 - version: 3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 3.3.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2765,16 +2946,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection-custom-config: dependencies: @@ -2785,11 +2966,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2811,16 +2992,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/issue-8049: dependencies: @@ -2831,11 +3012,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2851,19 +3032,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/query-integration: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2877,11 +3058,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -2894,7 +3075,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2912,7 +3093,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2920,8 +3101,57 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + e2e/react-start/response-reconciliation: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + react: + specifier: ~19.2.9 + version: 19.2.9 + react-dom: + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@rsbuild/core': + specifier: ^2.3.1 + version: 2.3.1 + '@rsbuild/plugin-react': + specifier: ^2.0.0 + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@types/react': + specifier: ^19.2.8 + version: 19.2.9 + '@types/react-dom': + specifier: ^19.2.3 + version: 19.2.3(@types/react@19.2.9) + '@vitejs/plugin-react': + specifier: ^6.0.1 + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + srvx: + specifier: ^1.0.0 + version: 1.0.5 + typescript: + specifier: ^6.0.2 + version: 6.0.2 + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/root-document-hydration: dependencies: @@ -2932,11 +3162,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -2958,16 +3188,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsbuild: dependencies: @@ -2978,21 +3208,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3006,8 +3236,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) srvx: - specifier: ^0.10.0 - version: 0.10.1 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: ^5.7.2 version: 5.9.3 @@ -3024,21 +3254,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/eslint-plugin-start': specifier: workspace:^ version: link:../../../packages/eslint-plugin-start @@ -3059,22 +3289,22 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.9.2) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': - specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^0.5.39 + version: 0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint: specifier: ^9.22.0 version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) srvx: - specifier: ^0.10.0 - version: 0.10.0 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: ^5.7.2 version: 5.9.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-deferred-hydration: dependencies: @@ -3085,11 +3315,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3111,28 +3341,28 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': - specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^0.5.39 + version: 0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-query: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3146,11 +3376,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3169,19 +3399,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': - specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^0.5.39 + version: 0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.10.0 - version: 0.10.0 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: ^5.7.2 version: 5.9.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-rsbuild: dependencies: @@ -3192,21 +3422,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3220,8 +3450,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) srvx: - specifier: ^0.10.0 - version: 0.10.1 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: ^5.7.2 version: 5.9.3 @@ -3238,11 +3468,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3258,7 +3488,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3276,13 +3506,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3290,8 +3520,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/selective-ssr: dependencies: @@ -3305,18 +3535,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) zod: specifier: ^4.4.3 version: 4.4.3 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3334,10 +3564,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3345,8 +3575,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/serialization-adapters: dependencies: @@ -3360,18 +3590,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) zod: specifier: ^4.4.3 version: 4.4.3 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3389,10 +3619,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3400,14 +3630,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-functions: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3424,11 +3654,11 @@ importers: specifier: ^3.0.5 version: 3.0.5 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3443,17 +3673,17 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3474,13 +3704,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3488,8 +3718,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-functions-global-middleware: dependencies: @@ -3500,18 +3730,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3529,10 +3759,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3540,14 +3770,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-routes: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3564,11 +3794,11 @@ importers: specifier: ^3.0.5 version: 3.0.5 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3584,7 +3814,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3605,13 +3835,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3619,8 +3849,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-routes-global-middleware: dependencies: @@ -3631,18 +3861,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3660,10 +3890,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3671,8 +3901,69 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + e2e/react-start/session-handling: + dependencies: + '@hono/session': + specifier: 0.2.1 + version: 0.2.1(hono@4.13.9) + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + hono: + specifier: 4.13.9 + version: 4.13.9 + hono-sessions: + specifier: 0.8.1 + version: 0.8.1(hono@4.13.9) + iron-session: + specifier: 9.0.1 + version: 9.0.1 + react: + specifier: ~19.2.9 + version: 19.2.9 + react-dom: + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@rsbuild/core': + specifier: ^2.3.1 + version: 2.3.1 + '@rsbuild/plugin-react': + specifier: ^2.0.0 + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@types/react': + specifier: ^19.2.8 + version: 19.2.9 + '@types/react-dom': + specifier: ^19.2.3 + version: 19.2.3(@types/react@19.2.9) + '@vitejs/plugin-react': + specifier: ^6.0.1 + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + srvx: + specifier: ^1.0.0 + version: 1.0.5 + typescript: + specifier: ^6.0.2 + version: 6.0.2 + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/spa-mode: dependencies: @@ -3686,15 +3977,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3717,8 +4008,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/split-base-and-basepath: dependencies: @@ -3732,11 +4023,11 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3758,16 +4049,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/start-manifest: dependencies: @@ -3778,11 +4069,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3804,16 +4095,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/static-server-functions: dependencies: @@ -3827,14 +4118,14 @@ importers: specifier: workspace:* version: link:../../../packages/start-static-server-functions nitro: - specifier: ^3.0.1-alpha.2 - version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3856,19 +4147,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/streaming-ssr: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3879,11 +4170,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3905,16 +4196,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/transform-asset-urls: dependencies: @@ -3928,11 +4219,11 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -3954,16 +4245,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/virtual-routes: dependencies: @@ -3980,11 +4271,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -4000,7 +4291,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4018,13 +4309,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4032,8 +4323,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/website: dependencies: @@ -4047,11 +4338,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -4067,7 +4358,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4085,10 +4376,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4096,8 +4387,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/solid-router/basepath-file-based: dependencies: @@ -4121,17 +4412,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4155,11 +4446,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -4193,13 +4484,13 @@ importers: version: 0.27.4 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@7.2.0) + version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@10.2.2) e2e/solid-router/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4232,17 +4523,17 @@ importers: specifier: ^1.1.11 version: 1.1.11 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-file-based-code-splitting: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4272,17 +4563,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4312,17 +4603,17 @@ importers: specifier: ~5.9.0 version: 5.9.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -4352,17 +4643,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4398,17 +4689,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4441,17 +4732,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4484,17 +4775,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/generator-cli-only: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -4521,17 +4812,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/js-only-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4558,11 +4849,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -4583,14 +4874,14 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-solid': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2) + version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -4632,14 +4923,14 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-solid': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2) + version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -4669,7 +4960,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4699,11 +4990,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/sentry-integration: dependencies: @@ -4715,10 +5006,10 @@ importers: version: 7.120.4 '@sentry/vite-plugin': specifier: ^4.6.1 - version: 4.6.1(supports-color@7.2.0) + version: 4.6.1(supports-color@10.2.2) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4742,17 +5033,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4788,11 +5079,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic: dependencies: @@ -4831,20 +5122,20 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-solid': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2) + version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4861,8 +5152,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4870,11 +5161,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-auth: dependencies: @@ -4886,7 +5177,7 @@ importers: version: 7.0.0 '@prisma/client': specifier: ^7.0.0 - version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4896,6 +5187,9 @@ importers: '@tanstack/solid-start': specifier: workspace:* version: link:../../../packages/solid-start + iron-session: + specifier: ^9.0.1 + version: 9.0.1 redaxios: specifier: 'catalog:' version: 0.5.1 @@ -4911,7 +5205,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4926,10 +5220,10 @@ importers: version: 17.2.3 prisma: specifier: ^7.0.0 - version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4937,11 +5231,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-cloudflare: dependencies: @@ -4960,13 +5254,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4983,11 +5277,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -5030,7 +5324,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5041,8 +5335,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5050,11 +5344,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-tsr-config: dependencies: @@ -5084,17 +5378,17 @@ importers: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/csp: dependencies: @@ -5121,17 +5415,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/css-modules: dependencies: @@ -5161,17 +5455,17 @@ importers: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/custom-basepath: dependencies: @@ -5199,7 +5493,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5216,8 +5510,8 @@ importers: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5228,11 +5522,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/deferred-hydration: dependencies: @@ -5247,14 +5541,14 @@ importers: version: 1.9.12 devDependencies: '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-solid': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2) + version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5265,17 +5559,57 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + + e2e/solid-start/dev-ssr-styles: + dependencies: + '@tanstack/solid-router': + specifier: workspace:* + version: link:../../../packages/solid-router + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + solid-js: + specifier: 1.9.12 + version: 1.9.12 + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-core': + specifier: workspace:* + version: link:../../../packages/router-core + '@tanstack/router-e2e-utils': + specifier: workspace:* + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + srvx: + specifier: ^1.0.0 + version: 1.0.5 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-solid: + specifier: ^2.11.11 + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/query-integration: dependencies: @@ -5312,7 +5646,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5329,11 +5663,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/scroll-restoration: dependencies: @@ -5364,7 +5698,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5378,8 +5712,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5387,11 +5721,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/selective-ssr: dependencies: @@ -5410,7 +5744,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5418,8 +5752,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5427,11 +5761,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/serialization-adapters: dependencies: @@ -5453,7 +5787,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5464,8 +5798,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5473,11 +5807,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/server-functions: dependencies: @@ -5517,7 +5851,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5534,8 +5868,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5543,11 +5877,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/server-routes: dependencies: @@ -5587,7 +5921,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5604,8 +5938,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5613,11 +5947,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/solid-query-layout-suspense: dependencies: @@ -5650,11 +5984,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/spa-mode: dependencies: @@ -5676,7 +6010,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5690,11 +6024,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/start-manifest: dependencies: @@ -5721,17 +6055,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/streaming-ssr: dependencies: @@ -5764,17 +6098,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/virtual-routes: dependencies: @@ -5808,7 +6142,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5822,8 +6156,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5831,11 +6165,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/website: dependencies: @@ -5866,7 +6200,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5877,8 +6211,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5886,17 +6220,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/vue-router/basepath-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -5930,16 +6264,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -5948,7 +6282,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5973,13 +6307,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6049,7 +6383,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6089,10 +6423,10 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.8.3) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) eslint-plugin-vue: specifier: ^9.33.0 version: 9.33.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -6100,8 +6434,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-eslint-parser: specifier: ^9.4.3 version: 9.4.3(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -6113,7 +6447,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6144,16 +6478,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6162,7 +6496,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6190,16 +6524,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) typescript: specifier: ~5.9.0 version: 5.9.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.9.3) @@ -6208,7 +6542,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6245,16 +6579,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6263,7 +6597,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6300,16 +6634,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6318,7 +6652,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-query': specifier: ^5.102.0 version: 5.102.0(vue@3.5.25(typescript@5.8.3)) @@ -6349,16 +6683,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6367,7 +6701,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6404,16 +6738,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6422,7 +6756,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -6450,16 +6784,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6468,16 +6802,16 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/vue-query': specifier: ^5.102.0 - version: 5.102.0(vue@3.5.25(typescript@7.0.2)) + version: 5.102.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@7.0.2)))(vue@3.5.25(typescript@7.0.2)) + version: 6.1.2(@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6492,7 +6826,7 @@ importers: version: 4.2.2 vue: specifier: ^3.5.16 - version: 3.5.25(typescript@7.0.2) + version: 3.5.25(typescript@6.0.2) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -6502,13 +6836,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@6.0.2)) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-router/rspack-basic-file-based: dependencies: @@ -6529,17 +6863,17 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 - version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -6587,17 +6921,17 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 - version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -6630,7 +6964,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6661,16 +6995,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6682,13 +7016,13 @@ importers: version: 7.120.4 '@sentry/vite-plugin': specifier: ^4.6.1 - version: 4.6.1(supports-color@7.2.0) + version: 4.6.1(supports-color@10.2.2) '@sentry/vue': specifier: ^10.32.0 version: 10.32.0(@tanstack/vue-router@packages+vue-router)(vue@3.5.25(typescript@5.8.3)) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6713,13 +7047,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6728,7 +7062,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6762,16 +7096,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6813,23 +7147,23 @@ importers: specifier: ^1.63.0 version: 1.63.0 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 - version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6844,16 +7178,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6861,8 +7195,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-auth: dependencies: @@ -6874,7 +7208,7 @@ importers: version: 7.0.0 '@prisma/client': specifier: ^7.0.0 - version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6884,6 +7218,9 @@ importers: '@tanstack/vue-start': specifier: workspace:* version: link:../../../packages/vue-start + iron-session: + specifier: ^9.0.1 + version: 9.0.1 redaxios: specifier: 'catalog:' version: 0.5.1 @@ -6899,7 +7236,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6911,19 +7248,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) dotenv: specifier: ^17.2.3 version: 17.2.3 prisma: specifier: ^7.0.0 - version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6931,8 +7268,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-cloudflare: dependencies: @@ -6951,13 +7288,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6969,10 +7306,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6980,8 +7317,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -7012,22 +7349,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) rimraf: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-vue-query: dependencies: @@ -7067,7 +7404,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7079,13 +7416,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7093,8 +7430,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/css-modules: dependencies: @@ -7122,19 +7459,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) sass: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/custom-basepath: dependencies: @@ -7162,7 +7499,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7177,16 +7514,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) cross-env: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7197,8 +7534,51 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + e2e/vue-start/dev-ssr-styles: + dependencies: + '@tanstack/vue-router': + specifier: workspace:* + version: link:../../../packages/vue-router + '@tanstack/vue-start': + specifier: workspace:* + version: link:../../../packages/vue-start + vue: + specifier: ^3.5.16 + version: 3.5.25(@typescript/typescript6@6.0.2) + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-core': + specifier: workspace:* + version: link:../../../packages/router-core + '@tanstack/router-e2e-utils': + specifier: workspace:* + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + '@vitejs/plugin-vue': + specifier: ^6.0.5 + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + '@vitejs/plugin-vue-jsx': + specifier: ^5.1.5 + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + srvx: + specifier: ^1.0.0 + version: 1.0.5 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/query-integration: dependencies: @@ -7235,7 +7615,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7247,10 +7627,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7258,8 +7638,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/scroll-restoration: dependencies: @@ -7290,7 +7670,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7302,16 +7682,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7319,8 +7699,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/selective-ssr: dependencies: @@ -7339,7 +7719,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7348,13 +7728,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7362,8 +7742,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7388,7 +7768,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7397,13 +7777,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7411,8 +7791,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7455,7 +7835,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7470,16 +7850,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7487,8 +7867,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/server-routes: dependencies: @@ -7528,7 +7908,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7543,16 +7923,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7560,8 +7940,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/spa-mode: dependencies: @@ -7583,7 +7963,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7592,10 +7972,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7603,8 +7983,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/start-manifest: dependencies: @@ -7632,16 +8012,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/streaming-ssr: dependencies: @@ -7675,16 +8055,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.15 + specifier: ^1.0.0 + version: 1.0.5 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/virtual-routes: dependencies: @@ -7718,7 +8098,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7730,16 +8110,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7747,8 +8127,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/website: dependencies: @@ -7779,7 +8159,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7791,13 +8171,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7805,14 +8185,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/authenticated-routes: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7823,11 +8203,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -7849,19 +8229,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/authenticated-routes-firebase: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7875,11 +8255,11 @@ importers: specifier: ^11.4.0 version: 11.4.0 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -7904,19 +8284,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7924,11 +8304,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -7947,22 +8327,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-default-search-params: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7970,11 +8350,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -7996,25 +8376,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-devtools-panel: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.67.2 - version: 5.67.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.67.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8022,11 +8402,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8045,19 +8425,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8068,11 +8448,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8094,19 +8474,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-non-nested-devtools: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8114,11 +8494,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8137,25 +8517,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8163,11 +8543,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8186,25 +8566,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8215,11 +8595,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8241,13 +8621,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-file-based: dependencies: @@ -8270,11 +8650,11 @@ importers: specifier: ^3.3.2 version: 3.3.2 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tanstack/react-router-devtools': specifier: workspace:^ @@ -8293,13 +8673,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-streaming-file-based: dependencies: @@ -8322,11 +8702,11 @@ importers: specifier: ^3.3.2 version: 3.3.2 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tanstack/react-router-devtools': specifier: workspace:^ @@ -8345,19 +8725,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8371,11 +8751,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8397,19 +8777,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-virtual-inside-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8423,11 +8803,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8449,19 +8829,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/deferred-data: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8469,11 +8849,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8495,19 +8875,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8515,11 +8895,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -8541,19 +8921,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8564,11 +8944,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8590,19 +8970,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8616,11 +8996,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8642,25 +9022,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8671,11 +9051,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8697,25 +9077,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8729,11 +9109,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8755,22 +9135,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/large-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8781,11 +9161,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8807,25 +9187,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/location-masking: dependencies: '@radix-ui/react-dialog': specifier: ^1.1.6 - version: 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8833,11 +9213,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8856,22 +9236,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/navigation-blocking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8879,11 +9259,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8902,19 +9282,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8922,11 +9302,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -8942,13 +9322,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-esbuild-file-based: dependencies: @@ -8962,11 +9342,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8988,7 +9368,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8999,11 +9379,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9025,13 +9405,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-rspack-file-based: dependencies: @@ -9048,21 +9428,21 @@ importers: specifier: ^8.5.1 version: 8.5.3 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -9088,11 +9468,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@swc/core': specifier: ^1.15.33 @@ -9129,16 +9509,16 @@ importers: version: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.97.1) webpack-dev-server: specifier: ^5.2.4 - version: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) + version: 5.2.4(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) examples/react/router-monorepo-react-query: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9149,11 +9529,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9172,16 +9552,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -9193,17 +9573,17 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9218,7 +9598,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9226,11 +9606,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -9242,13 +9622,13 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@types/react': specifier: ^19.2.8 @@ -9261,22 +9641,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9289,13 +9669,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/router-monorepo-react-query/packages/router: dependencies: @@ -9307,7 +9687,7 @@ importers: version: link:../../../../../packages/history '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../../../packages/react-router @@ -9315,11 +9695,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9338,16 +9718,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple: dependencies: @@ -9361,11 +9741,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9384,16 +9764,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -9407,11 +9787,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9430,16 +9810,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -9450,15 +9830,15 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9473,7 +9853,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9481,11 +9861,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -9494,13 +9874,13 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@types/react': specifier: ^19.2.8 @@ -9513,16 +9893,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -9536,11 +9916,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9559,16 +9939,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -9579,15 +9959,15 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9602,7 +9982,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9610,11 +9990,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -9622,11 +10002,11 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@types/react': specifier: ^19.2.8 @@ -9639,16 +10019,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -9662,11 +10042,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9685,22 +10065,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9709,13 +10089,13 @@ importers: version: link:../../../packages/react-router-devtools '@tanstack/react-virtual': specifier: ^3.13.0 - version: 3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9731,25 +10111,25 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/search-validator-adapters: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9769,11 +10149,11 @@ importers: specifier: ^2.1.7 version: 2.1.7 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9785,11 +10165,11 @@ importers: version: 3.25.76 devDependencies: '@testing-library/jest-dom': - specifier: ^6.6.3 - version: 6.6.3 + specifier: ^7.0.1 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/react': specifier: ^16.2.0 - version: 16.2.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.2.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -9801,7 +10181,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -9809,11 +10189,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: - specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^5.0.4 + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/start-bare: dependencies: @@ -9827,11 +10207,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) zod: specifier: ^4.4.3 version: 4.4.3 @@ -9850,13 +10230,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic: dependencies: @@ -9870,11 +10250,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -9884,7 +10264,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -9899,10 +10279,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9910,8 +10290,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-auth: dependencies: @@ -9923,7 +10303,7 @@ importers: version: 7.0.0 '@prisma/client': specifier: ^7.0.0 - version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9933,12 +10313,15 @@ importers: '@tanstack/react-start': specifier: workspace:* version: link:../../../packages/react-start + iron-session: + specifier: ^9.0.1 + version: 9.0.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9948,7 +10331,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -9963,13 +10346,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) dotenv: specifier: ^17.2.3 version: 17.2.3 prisma: specifier: ^7.0.0 - version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9977,8 +10360,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-authjs: dependencies: @@ -9995,11 +10378,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) start-authjs: specifier: ^1.0.0 version: 1.0.0(@auth/core@0.41.1) @@ -10009,7 +10392,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10024,7 +10407,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10032,8 +10415,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-cloudflare: dependencies: @@ -10047,18 +10430,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10073,7 +10456,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10081,8 +10464,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -10091,10 +10474,10 @@ importers: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10108,11 +10491,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10125,7 +10508,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10140,7 +10523,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10148,8 +10531,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-rsbuild: dependencies: @@ -10163,11 +10546,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -10176,14 +10559,14 @@ importers: version: 4.4.3 devDependencies: '@rsbuild/core': - specifier: ^2.0.11 - version: 2.0.14 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23)) '@rsbuild/plugin-tailwindcss': specifier: ^2.0.3 - version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) + version: 2.0.3(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10197,8 +10580,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^0.11.18 - version: 0.11.18 + specifier: ^1.0.0 + version: 1.0.5 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10222,13 +10605,13 @@ importers: version: link:../../../packages/start-static-server-functions '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10238,7 +10621,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10258,17 +10641,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-bun: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-devtools': specifier: ^0.7.0 - version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) + version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10285,24 +10668,24 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@tanstack/eslint-config': specifier: ^0.3.2 - version: 0.3.2(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + version: 0.3.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) '@testing-library/dom': specifier: ^10.4.1 version: 10.4.1 '@testing-library/react': specifier: ^16.3.0 - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/bun': specifier: ^1.2.22 version: 1.2.22(@types/react@19.2.9) @@ -10320,7 +10703,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -10331,11 +10714,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: - specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^5.0.4 + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -10344,7 +10727,7 @@ importers: dependencies: '@clerk/tanstack-react-start': specifier: ^0.27.14 - version: 0.27.14(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.27.14(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10356,26 +10739,26 @@ importers: version: link:../../../packages/react-start '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 srvx: - specifier: ^0.11.9 - version: 0.11.12 + specifier: ^1.0.0 + version: 1.0.5 tailwind-merge: specifier: ^3.6.0 version: 3.6.0 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10395,20 +10778,20 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-convex-trellaux: dependencies: '@convex-dev/react-query': specifier: 0.0.0-alpha.8 - version: 0.0.0-alpha.8(@tanstack/react-query@5.102.0(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 0.0.0-alpha.8(@tanstack/react-query@5.102.0(react@19.2.9))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10426,7 +10809,7 @@ importers: version: 8.2.2 convex: specifier: ^1.19.0 - version: 1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9) ky: specifier: ^1.7.4 version: 1.7.4 @@ -10434,14 +10817,14 @@ importers: specifier: ^2.7.0 version: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) react-hot-toast: specifier: ^2.5.1 - version: 2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10454,7 +10837,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10469,7 +10852,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10477,8 +10860,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-counter: dependencies: @@ -10492,11 +10875,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@types/node': specifier: 25.0.9 @@ -10512,19 +10895,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-i18n-paraglide: dependencies: '@tanstack/react-devtools': specifier: ^0.7.0 - version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) + version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10535,18 +10918,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@inlang/paraglide-js': specifier: ^2.4.0 version: 2.4.0(babel-plugin-macros@3.1.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10561,7 +10944,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10569,14 +10952,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-large: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10587,11 +10970,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10604,7 +10987,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10619,7 +11002,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10627,8 +11010,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-material-ui: dependencies: @@ -10637,16 +11020,16 @@ importers: version: 11.14.0 '@emotion/react': specifier: 11.14.0 - version: 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + version: 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) '@emotion/styled': specifier: 11.14.0 - version: 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + version: 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) '@fontsource-variable/roboto': specifier: 5.2.5 version: 5.2.5 '@mui/material': specifier: 6.4.7 - version: 6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10657,11 +11040,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) zod: specifier: ^4.4.3 version: 4.4.3 @@ -10680,13 +11063,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-next-migration: dependencies: @@ -10697,17 +11080,17 @@ importers: specifier: workspace:* version: link:../../../packages/react-start iron-session: - specifier: ^9.0.0 + specifier: ^9.0.1 version: 9.0.1 next: specifier: 16.3.4 - version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.97.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@playwright/test': specifier: ^1.63.0 @@ -10723,16 +11106,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-rscs: dependencies: @@ -10749,11 +11132,11 @@ importers: specifier: ^4.0.10 version: 4.2.1 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -10762,11 +11145,11 @@ importers: version: 4.4.3 zustand: specifier: ^5.0.10 - version: 5.0.12(@types/react@19.2.9)(immer@10.1.1)(react@19.2.3)(use-sync-external-store@1.6.0(react@19.2.3)) + version: 5.0.12(@types/react@19.2.9)(immer@10.1.1)(react@19.2.9)(use-sync-external-store@1.6.0(react@19.2.9)) devDependencies: '@tailwindcss/vite': specifier: ^4.1.18 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10778,13 +11161,13 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': - specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^0.5.39 + version: 0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.1.18 version: 4.2.2 @@ -10792,8 +11175,8 @@ importers: specifier: ^5.7.2 version: 5.9.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-streaming-data-from-server-functions: dependencies: @@ -10807,11 +11190,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) zod: specifier: ^4.4.3 version: 4.4.3 @@ -10830,13 +11213,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-supabase-basic: dependencies: @@ -10856,18 +11239,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -10879,7 +11262,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10887,8 +11270,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-tailwind-v4: dependencies: @@ -10902,11 +11285,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -10916,7 +11299,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10931,7 +11314,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10939,17 +11322,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-trellaux: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10969,14 +11352,14 @@ importers: specifier: ^2.7.0 version: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) react-hot-toast: specifier: ^2.5.1 - version: 2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10989,7 +11372,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11004,7 +11387,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11012,14 +11395,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-workos: dependencies: '@radix-ui/themes': specifier: ^3.3.0 - version: 3.3.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 3.3.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11031,13 +11414,13 @@ importers: version: link:../../../packages/react-start '@workos/authkit-tanstack-react-start': specifier: ^0.5.0 - version: 0.5.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.5.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) devDependencies: '@types/react': specifier: ^19.2.8 @@ -11050,19 +11433,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11073,11 +11456,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11099,19 +11482,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-framer-motion: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11120,13 +11503,13 @@ importers: version: link:../../../packages/react-router-devtools framer-motion: specifier: ^11.18.2 - version: 11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11148,19 +11531,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-trpc: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11180,11 +11563,11 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11206,25 +11589,25 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tsx: specifier: ^4.20.3 version: 4.20.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-trpc-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11242,16 +11625,16 @@ importers: version: 11.4.3(@typescript/typescript6@6.0.2) '@trpc/tanstack-react-query': specifier: ^11.4.3 - version: 11.4.3(@tanstack/react-query@5.102.0(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2))(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 11.4.3(@tanstack/react-query@5.102.0(react@19.2.9))(@trpc/client@11.4.3(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2))(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) express: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11273,24 +11656,24 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tsx: specifier: ^4.20.3 version: 4.20.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/solid/authenticated-routes: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11315,22 +11698,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/authenticated-routes-firebase: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11361,19 +11744,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11401,22 +11784,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-default-search-params: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11441,19 +11824,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-devtools-panel: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11475,19 +11858,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11515,19 +11898,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-non-nested-devtools: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11555,17 +11938,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11573,7 +11956,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11598,17 +11981,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11616,7 +11999,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11644,11 +12027,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-ssr-file-based: dependencies: @@ -11656,7 +12039,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11687,19 +12070,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-ssr-streaming-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11742,22 +12125,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11785,22 +12168,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-virtual-inside-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11828,19 +12211,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/deferred-data: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11865,22 +12248,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11902,19 +12285,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11942,19 +12325,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11985,17 +12368,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -12003,7 +12386,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12031,17 +12414,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12052,7 +12435,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12080,17 +12463,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/large-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12098,7 +12481,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12123,22 +12506,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/location-masking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12160,22 +12543,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/navigation-blocking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12197,19 +12580,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12228,11 +12611,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart-esbuild-file-based: dependencies: @@ -12240,7 +12623,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12263,15 +12646,15 @@ importers: version: 0.27.4 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@7.2.0) + version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@10.2.2) examples/solid/quickstart-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12299,11 +12682,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart-rspack-file-based: dependencies: @@ -12311,7 +12694,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12327,14 +12710,14 @@ importers: version: 4.2.2 devDependencies: '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.3.1 + version: 2.3.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@rsbuild/plugin-solid': specifier: ^1.1.1 - version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2) + version: 1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12348,7 +12731,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12398,13 +12781,13 @@ importers: version: '@typescript/typescript6@6.0.2' webpack: specifier: ^5.97.1 - version: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + version: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.97.1) webpack-dev-server: specifier: ^5.2.4 - version: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) + version: 5.2.4(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) examples/solid/router-monorepo-simple: dependencies: @@ -12412,7 +12795,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12434,14 +12817,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/router-monorepo-simple-lazy: dependencies: @@ -12449,7 +12832,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12471,14 +12854,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/router-monorepo-solid-query: dependencies: @@ -12492,7 +12875,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12514,22 +12897,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12551,17 +12934,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/search-validator-adapters: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter @@ -12572,7 +12955,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12603,8 +12986,8 @@ importers: specifier: ^0.8.10 version: 0.8.10(solid-js@1.9.12) '@testing-library/jest-dom': - specifier: ^6.6.3 - version: 6.6.3 + specifier: ^7.0.1 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -12615,19 +12998,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: - specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^5.0.4 + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12647,7 +13030,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12655,8 +13038,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12664,11 +13047,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-auth: dependencies: @@ -12680,9 +13063,9 @@ importers: version: 7.0.0 '@prisma/client': specifier: ^7.0.0 - version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12690,6 +13073,9 @@ importers: '@tanstack/solid-start': specifier: workspace:* version: link:../../../packages/solid-start + iron-session: + specifier: ^9.0.1 + version: 9.0.1 redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -12702,7 +13088,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12714,7 +13100,7 @@ importers: version: 17.2.3 prisma: specifier: ^7.0.0 - version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12722,11 +13108,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-authjs: dependencies: @@ -12734,7 +13120,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12754,7 +13140,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12768,16 +13154,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12791,10 +13177,10 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12808,11 +13194,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -12820,7 +13206,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12834,10 +13220,10 @@ importers: devDependencies: '@netlify/vite-plugin-tanstack-start': specifier: ^1.3.19 - version: 1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12851,16 +13237,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12874,7 +13260,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12882,8 +13268,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12891,11 +13277,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-solid-query: dependencies: @@ -12906,7 +13292,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12929,7 +13315,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12943,16 +13329,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12975,7 +13361,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12989,17 +13375,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-bun: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13007,7 +13393,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13030,7 +13416,7 @@ importers: version: 0.8.10(solid-js@1.9.12) '@tanstack/eslint-config': specifier: ^0.3.2 - version: 0.3.2(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + version: 0.3.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) '@testing-library/dom': specifier: ^10.4.1 version: 10.4.1 @@ -13053,14 +13439,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: - specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^5.0.4 + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -13069,12 +13455,12 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9))(hono@4.13.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13084,16 +13470,16 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.6.19 - version: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) clsx: specifier: ^2.1.1 version: 2.1.1 convex: specifier: ^1.28.2 - version: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) + version: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9) convex-solidjs: specifier: ^0.0.3 - version: 0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) + version: 0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9)(solid-js@1.9.12) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -13123,16 +13509,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13166,11 +13552,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-i18n-paraglide: dependencies: @@ -13178,7 +13564,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13195,7 +13581,7 @@ importers: version: 2.4.0(babel-plugin-macros@3.1.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13209,11 +13595,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-large: dependencies: @@ -13221,7 +13607,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13244,7 +13630,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13258,16 +13644,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13292,11 +13678,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-supabase-basic: dependencies: @@ -13307,7 +13693,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13324,7 +13710,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13338,16 +13724,16 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13367,7 +13753,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13381,22 +13767,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13421,19 +13807,19 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/with-framer-motion: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13461,22 +13847,22 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/with-trpc: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.43 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13510,11 +13896,11 @@ importers: specifier: ^4.20.3 version: 4.20.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/vue/basic: dependencies: @@ -13536,22 +13922,22 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -13560,7 +13946,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13594,10 +13980,10 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.8.3) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) eslint-plugin-vue: specifier: ^9.33.0 version: 9.33.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13605,8 +13991,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-eslint-parser: specifier: ^9.4.3 version: 9.4.3(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13618,7 +14004,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13643,16 +14029,16 @@ importers: devDependencies: '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -13667,13 +14053,13 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -13690,20 +14076,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/eslint-plugin-router: dependencies: @@ -13716,7 +14102,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript-eslint/rule-tester': specifier: ^8.23.0 version: 8.23.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13733,11 +14119,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/eslint-plugin-start: dependencies: @@ -13753,7 +14139,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(rollup@4.63.1)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript-eslint/rule-tester': specifier: ^8.44.1 version: 8.53.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.9.2) @@ -13771,7 +14157,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/history: devDependencies: @@ -13780,7 +14166,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -13791,39 +14177,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - - packages/nitro-v2-vite-plugin: - dependencies: - nitropack: - specifier: ^2.13.4 - version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) - pathe: - specifier: 'catalog:' - version: 2.0.3 - vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - devDependencies: - '@arethetypeswrong/cli': - specifier: 'catalog:' - version: 0.18.4 - '@tanstack/vite-config': - specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - publint: - specifier: 'catalog:' - version: 0.3.17 - rimraf: - specifier: 'catalog:' - version: 6.1.2 - vitest: - specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-router: dependencies: @@ -13831,8 +14189,8 @@ importers: specifier: workspace:* version: link:../history '@tanstack/react-store': - specifier: ^0.11.0 - version: 0.11.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: ^0.11.2 + version: 0.11.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/router-core': specifier: workspace:* version: link:../router-core @@ -13848,16 +14206,16 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13869,7 +14227,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: 'catalog:' version: 1.1.11 @@ -13883,20 +14241,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -13921,7 +14279,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13933,7 +14291,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -13944,20 +14302,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-router-ssr-query: dependencies: @@ -13976,13 +14334,13 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.3) + version: 5.102.0(react@19.2.9) '@tanstack/react-router': specifier: workspace:* version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -13991,7 +14349,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14002,20 +14360,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start: dependencies: @@ -14047,8 +14405,8 @@ importers: specifier: 'catalog:' version: 2.0.3 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -14058,10 +14416,10 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rsbuild/core': specifier: 'catalog:' - version: 2.2.5 + version: 2.3.1 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14081,17 +14439,17 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-client: dependencies: @@ -14113,10 +14471,10 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14128,7 +14486,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14139,20 +14497,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-rsc: dependencies: @@ -14188,14 +14546,14 @@ importers: specifier: 'catalog:' version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rspack/core': - specifier: 2.0.0 - version: 2.0.0(@swc/helpers@0.5.23) + specifier: 2.2.7 + version: 2.2.7(@swc/helpers@0.5.23) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14204,10 +14562,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': - specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^0.5.39 + version: 0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14218,20 +14576,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) react-server-dom-rspack: - specifier: ^0.0.2 - version: 0.0.2(@rspack/core@2.0.0(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: ^0.1.1 + version: 0.1.1(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-dom@19.2.9(react@19.2.9))(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-server: dependencies: @@ -14253,7 +14611,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14265,7 +14623,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14276,11 +14634,11 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 @@ -14288,36 +14646,33 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-cli: dependencies: '@tanstack/router-generator': specifier: workspace:* version: link:../router-generator + cac: + specifier: ^7.1.0 + version: 7.1.0 chokidar: specifier: 'catalog:' version: 5.0.0 - yargs: - specifier: ^17.7.2 - version: 17.7.2 devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 - '@types/yargs': - specifier: ^17.0.33 - version: 17.0.33 publint: specifier: 'catalog:' version: 0.3.17 @@ -14325,11 +14680,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-core: dependencies: @@ -14350,11 +14705,11 @@ importers: specifier: 'catalog:' version: 0.18.4 '@tanstack/store': - specifier: ^0.11.0 - version: 0.11.1 + specifier: ^0.11.2 + version: 0.11.2 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14371,11 +14726,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-devtools: dependencies: @@ -14397,7 +14752,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14406,7 +14761,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14414,20 +14769,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-devtools-core: dependencies: @@ -14449,10 +14804,10 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14466,14 +14821,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-generator: dependencies: @@ -14510,7 +14865,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14521,17 +14876,17 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-plugin: dependencies: @@ -14560,14 +14915,14 @@ importers: specifier: 'catalog:' version: 5.0.0 unplugin: - specifier: ^3.3.0 - version: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) + specifier: ^3.5.0 + version: 3.7.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(esbuild@0.28.1)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.10 || ^3.0.0-0 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14577,10 +14932,10 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.2.5 + version: 2.3.1 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 @@ -14599,24 +14954,27 @@ importers: jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) + prettier: + specifier: ^3.9.6 + version: 3.9.6 publint: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) webpack: specifier: ^5.104.1 - version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) packages/router-ssr-query-core: devDependencies: @@ -14631,7 +14989,7 @@ importers: version: link:../router-core '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14642,11 +15000,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-utils: dependencies: @@ -14666,8 +15024,8 @@ importers: specifier: ^1.0.12 version: 1.0.12(supports-color@10.2.2) diff: - specifier: ^8.0.4 - version: 8.0.4 + specifier: ^9.0.0 + version: 9.0.0 pathe: specifier: 'catalog:' version: 2.0.3 @@ -14680,7 +15038,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__generator': specifier: ^7.27.0 version: 7.27.0 @@ -14694,11 +15052,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-vite-plugin: dependencies: @@ -14711,7 +15069,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -14719,11 +15077,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-router: dependencies: @@ -14751,10 +15109,10 @@ importers: version: 0.8.10(solid-js@1.9.12) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14774,14 +15132,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14803,7 +15161,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14817,14 +15175,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-router-ssr-query: dependencies: @@ -14846,7 +15204,7 @@ importers: version: link:../solid-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-solid: specifier: ^0.14.5 version: 0.14.5(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -14863,14 +15221,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start: dependencies: @@ -14907,13 +15265,13 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rsbuild/core': specifier: 'catalog:' - version: 2.2.5 + version: 2.3.1 '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14930,11 +15288,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start-client: dependencies: @@ -14956,10 +15314,10 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14970,14 +15328,14 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start-server: dependencies: @@ -14996,7 +15354,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -15016,14 +15374,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-client-core: dependencies: @@ -15045,7 +15403,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15059,11 +15417,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-fn-stubs: devDependencies: @@ -15072,7 +15430,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15080,11 +15438,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-plugin-core: dependencies: @@ -15116,8 +15474,8 @@ importers: specifier: workspace:* version: link:../start-server-core exsolve: - specifier: ^1.1.1 - version: 1.1.1 + specifier: ^1.1.3 + version: 1.2.0 lightningcss: specifier: ^1.33.0 version: 1.33.0 @@ -15134,8 +15492,8 @@ importers: specifier: ^0.7.6 version: 0.7.6 srvx: - specifier: ^0.11.22 - version: 0.11.22 + specifier: ^1.0.0 + version: 1.0.5 tinyglobby: specifier: 'catalog:' version: 0.2.17 @@ -15144,7 +15502,7 @@ importers: version: 1.6.4 vitefu: specifier: ^1.1.3 - version: 1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) xmlbuilder2: specifier: ^4.0.3 version: 4.0.3 @@ -15157,10 +15515,10 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.2.5 + version: 2.3.1 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 @@ -15173,6 +15531,9 @@ importers: '@types/picomatch': specifier: ^4.0.2 version: 4.0.2 + prettier: + specifier: ^3.9.6 + version: 3.9.6 publint: specifier: 'catalog:' version: 0.3.17 @@ -15180,11 +15541,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-server-core: dependencies: @@ -15200,12 +15561,12 @@ importers: '@tanstack/start-storage-context': specifier: workspace:* version: link:../start-storage-context + cookie-es: + specifier: ^3.0.0 + version: 3.1.1 fetchdts: - specifier: ^0.1.6 - version: 0.1.7 - h3-v2: - specifier: npm:h3@2.0.1-rc.20 - version: h3@2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)) + specifier: ^0.2.0 + version: 0.2.0 seroval: specifier: ^1.6.7 version: 1.6.7 @@ -15218,13 +15579,13 @@ importers: version: 1.0.0 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 - cookie-es: - specifier: ^3.0.0 - version: 3.1.1 + iron-session: + specifier: 9.0.1 + version: 9.0.1 jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15235,11 +15596,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-static-server-functions: dependencies: @@ -15261,7 +15622,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15275,11 +15636,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-storage-context: dependencies: @@ -15292,7 +15653,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15306,11 +15667,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/valibot-adapter: devDependencies: @@ -15322,13 +15683,13 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -15342,23 +15703,23 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 valibot: specifier: 1.0.0-beta.15 - version: 1.0.0-beta.15(typescript@7.0.2) + version: 1.0.0-beta.15(@typescript/typescript6@6.0.2) vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/virtual-file-routes: devDependencies: @@ -15367,7 +15728,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15378,11 +15739,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/vue-router: dependencies: @@ -15393,8 +15754,8 @@ importers: specifier: workspace:* version: link:../router-core '@tanstack/vue-store': - specifier: ^0.11.0 - version: 0.11.1(vue@3.5.25(@typescript/typescript6@6.0.2)) + specifier: ^0.11.2 + version: 0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vue/runtime-dom': specifier: ^3.5.25 version: 3.5.25 @@ -15407,10 +15768,10 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/vue': specifier: ^8.1.0 version: 8.1.0(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) @@ -15419,10 +15780,10 @@ importers: version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitest/ui': specifier: 'catalog:' - version: 4.1.4(vitest@4.1.4) + version: 5.0.4(vitest@5.0.4) combinate: specifier: 'catalog:' version: 1.1.11 @@ -15436,11 +15797,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15460,21 +15821,21 @@ importers: specifier: workspace:* version: link:../vue-router vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15483,7 +15844,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15505,13 +15866,13 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../vue-router '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15519,11 +15880,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15557,19 +15918,19 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.2.5 + version: 2.3.1 '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15580,11 +15941,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15606,10 +15967,10 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15620,11 +15981,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15646,13 +16007,13 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15666,11 +16027,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15685,13 +16046,13 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 6.6.3 + version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) '@testing-library/react': specifier: 'catalog:' - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -15705,20 +16066,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ^19.2.3 - version: 19.2.3 + specifier: ~19.2.9 + version: 19.2.9 react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) + specifier: ~19.2.9 + version: 19.2.9(react@19.2.9) rimraf: specifier: 'catalog:' version: 6.1.2 vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: ^3.24.2 version: 3.25.57 @@ -16009,18 +16370,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-react-jsx-self@7.27.1': - resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-jsx-source@7.27.1': - resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-typescript@7.27.1': resolution: {integrity: sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==} engines: {node: '>=6.9.0'} @@ -16155,6 +16504,9 @@ packages: resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==} hasBin: true + '@bufbuild/protobuf@2.16.0': + resolution: {integrity: sha512-FWa0sPlqYGJgpTs6OxBRcL/AW4JT0OIO+W1ajerluoTVh8CV0B7XM1qsNCRgnkSCkRCgOICKHRQlY17jrsm0+Q==} + '@bundled-es-modules/cookie@2.0.1': resolution: {integrity: sha512-8o+5fRPLNbjbdGRRmJj3h6Hh1AQJf2dk3qQ/5ZFb+PXkRNiSoMGGUKlsgLfrxneb72axVJyIYji64E2+nNfYyw==} @@ -16258,23 +16610,23 @@ packages: engines: {node: '>=18.17.0'} deprecated: 'This package is no longer supported. Please use @clerk/react instead. See the upgrade guide for more info: https://clerk.com/docs/guides/development/upgrading/upgrade-guides/core-3' peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@clerk/clerk-react@5.59.3': resolution: {integrity: sha512-r1gmAYxhXs+QkXjDwj5Eqvm0Io8PtJ4FKkA45khiAzIQXcaQLFq/wFy7d1K8OSIYAIdFbuO0bnIOU/FdgWOc+A==} engines: {node: '>=18.17.0'} deprecated: 'This package is no longer supported. Please use @clerk/react instead. See the upgrade guide for more info: https://clerk.com/docs/guides/development/upgrading/upgrade-guides/core-3' peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@clerk/shared@3.28.2': resolution: {integrity: sha512-BfBCPaoPoLCiU0b0MhQUfCjs+bWRRLkdHw0vBffSjtsFLxp1b5IL5D8nKgDPIKIIv7DmCCmO15tr+GqG3CGpYQ==} engines: {node: '>=18.17.0'} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: react: optional: true @@ -16285,8 +16637,8 @@ packages: resolution: {integrity: sha512-sJUur/7jnHHlAsdoDosxpOmfV05VR7K5rvqlFskj3GaAMFEJrvdOztw0hmhBGVSWiCpjTZfdGITegton8mo7mQ==} engines: {node: '>=18.17.0'} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: react: optional: true @@ -16299,8 +16651,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@clerk/tanstack-react-start@0.27.14': resolution: {integrity: sha512-So+pchhM3NUIY0sFqxh3yv2hG9bifPUqkCIDUKVzq0+korMhHTsMXBwcsbt2LpQ9UBXob1dW5v1WxtdWkqELFw==} @@ -16308,8 +16660,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@clerk/types@4.101.10': resolution: {integrity: sha512-qlmgnAm/IeK02RKEKVN8/Glx07xw/Lcv67jBfikM8HXhHc5v7bfYLD8UiWTr6H2RGtvB09cIt9JezRRlsuVBew==} @@ -16321,10 +16673,19 @@ packages: engines: {node: '>=18.17.0'} deprecated: 'This package is no longer supported. Please import types from @clerk/shared/types instead. See the upgrade guide for more info: https://clerk.com/docs/guides/development/upgrading/upgrade-guides/core-3' + '@cloudflare/build-output-utils@0.9.10': + resolution: {integrity: sha512-9F6RSV0FJnF0zQLIoMVgxc0ub57FrZBGKZ8oUQHyVAbbjodlcIHk0BF5fd3B89N/Y4cE+FSqzWfpq3RzFy3tjA==} + + '@cloudflare/config@0.30.2': + resolution: {integrity: sha512-YTasjo8Kvfn3SlVs5gHZ6fy73BNQafY2Y8aosasicO8CTRVj2h8K7h+IJnjHK+tzM00Qi96VcOCfefCNLuMauw==} + '@cloudflare/kv-asset-handler@0.4.2': resolution: {integrity: sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ==} engines: {node: '>=18.0.0'} + '@cloudflare/runtime-types@0.1.23': + resolution: {integrity: sha512-uQVuBfVlJqGFryfyiMG+62KKS6NNC/EKYqbHGnNE2ExhcPNUihfYp3hWtTKshikZe7STTmIaLpDqT+h7J8Fdrw==} + '@cloudflare/unenv-preset@2.15.0': resolution: {integrity: sha512-EGYmJaGZKWl+X8tXxcnx4v2bOZSjQeNI5dWFeXivgX9+YCT69AkzHHwlNbVpqtEUTbew8eQurpyOpeN8fg00nw==} peerDependencies: @@ -16334,10 +16695,19 @@ packages: workerd: optional: true + '@cloudflare/unenv-preset@2.16.2': + resolution: {integrity: sha512-JBP1+Z7ZSNG/d4mRP+y8VC5dka3tZVMLEZRvS+rzQ4DGV1EoxRFQckcJTTkXbHSQiTj0DtNI01Zwb/V2fX0mvQ==} + peerDependencies: + unenv: 2.0.0-rc.24 + workerd: '>1.20260305.0 <2.0.0-0' + peerDependenciesMeta: + workerd: + optional: true + '@cloudflare/vite-plugin@1.29.1': resolution: {integrity: sha512-HTbVG43olzk3KTZD8b0nlmJTI3G6sQdFTmuD9HMJy7bkQbxKppkt16jayFo/NWAAs1GJXpFjLkC8udRdyn3aEg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 wrangler: ^4.75.0 '@cloudflare/workerd-darwin-64@1.20260317.1': @@ -16346,39 +16716,69 @@ packages: cpu: [x64] os: [darwin] + '@cloudflare/workerd-darwin-64@1.20261104.1': + resolution: {integrity: sha512-5Bl+P1HT1/Ezk7Yrhyd+QkJ4VC/3naO0L3so/AkpgdaAHG3bmUmcCJBAtwH7O4JdVt8SMfm6EV89seiPpdjHJQ==} + engines: {node: '>=16'} + cpu: [x64] + os: [darwin] + '@cloudflare/workerd-darwin-arm64@1.20260317.1': resolution: {integrity: sha512-M/MnNyvO5HMgoIdr3QHjdCj2T1ki9gt0vIUnxYxBu9ISXS/jgtMl6chUVPJ7zHYBn9MyYr8ByeN6frjYxj0MGg==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] + '@cloudflare/workerd-darwin-arm64@1.20261104.1': + resolution: {integrity: sha512-2fM+0klAjspAQ3Jl0iw0gVyGpNnkvPiZ50WHigPLhWQRiS+zhabFXVR07zz1RaPGkJHrMjEpWoEfjjm8nU5IOg==} + engines: {node: '>=16'} + cpu: [arm64] + os: [darwin] + '@cloudflare/workerd-linux-64@1.20260317.1': resolution: {integrity: sha512-1ltuEjkRcS3fsVF7CxsKlWiRmzq2ZqMfqDN0qUOgbUwkpXsLVJsXmoblaLf5OP00ELlcgF0QsN0p2xPEua4Uug==} engines: {node: '>=16'} cpu: [x64] os: [linux] + '@cloudflare/workerd-linux-64@1.20261104.1': + resolution: {integrity: sha512-VgpZIOooZHjSxjEZIJ1hkyt/jTfL3KeavkWCc0x7xxVu9zgkplaJF78Iv6CzoCTamQXyZeBaRQHS2bbAc70Vgg==} + engines: {node: '>=16'} + cpu: [x64] + os: [linux] + '@cloudflare/workerd-linux-arm64@1.20260317.1': resolution: {integrity: sha512-3QrNnPF1xlaNwkHpasvRvAMidOvQs2NhXQmALJrEfpIJ/IDL2la8g499yXp3eqhG3hVMCB07XVY149GTs42Xtw==} engines: {node: '>=16'} cpu: [arm64] os: [linux] + '@cloudflare/workerd-linux-arm64@1.20261104.1': + resolution: {integrity: sha512-uEBJJHh2SbeQauRGrad7tIFIrpUQ5LUqZX40l7IKwYd0yeemvsno8f57w34Bx/pPpaSsNYVcV5oNFVbv+v/BOw==} + engines: {node: '>=16'} + cpu: [arm64] + os: [linux] + '@cloudflare/workerd-windows-64@1.20260317.1': resolution: {integrity: sha512-MfZTz+7LfuIpMGTa3RLXHX8Z/pnycZLItn94WRdHr8LPVet+C5/1Nzei399w/jr3+kzT4pDKk26JF/tlI5elpQ==} engines: {node: '>=16'} cpu: [x64] os: [win32] - '@codspeed/core@5.7.1': - resolution: {integrity: sha512-7mrFkqaY14rXu3XHv3o7bK3btLK0LFRxfeK3bQC8dLduI/Ty9eq8Hv8rx04FAY/onQbRTx3rUUQg5xprYHpATQ==} + '@cloudflare/workerd-windows-64@1.20261104.1': + resolution: {integrity: sha512-b/fnEU1leVm8UrI2EHQ4MSrK2vmnWdR1jefRyEUDZe3ucpKY0PWi4bVxWh5niZdlL0MIc4C5tXNXTlAMZpKDdA==} + engines: {node: '>=16'} + cpu: [x64] + os: [win32] - '@codspeed/vitest-plugin@5.7.1': - resolution: {integrity: sha512-yKNqaYVxZZPJYkhVHpz30Oem4TUgcI+/IRDD9YHvcAgi0P42CL6TB/+qYjuFOWghFzTPrm3TUbNFoBsevSTbUA==} + '@codspeed/core@6.0.1': + resolution: {integrity: sha512-p6yrZIoz/Bf5vW/QfGhiPOCKccGPES3jQ8NA+03qGcUYR3/U0tZ9h6ZkxVg2zLN10YaHrABEY4GtmTEEE5xF5Q==} + + '@codspeed/vitest-plugin@6.0.1': + resolution: {integrity: sha512-QEIkp3UtXwbT3eB7NZ49+Jz5xpzHopSFMscASF4lpbjTgbOt/Xax6vIPShDSPKB5JErexyJBze7AwCOPgkoNqQ==} peerDependencies: tinybench: '>=2.9.0' - vite: ^8.0.14 - vitest: ^3.2 || ^4 + vite: ^8.3.4 + vitest: ^3.2 || ^4 || ^5 '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} @@ -16393,8 +16793,8 @@ packages: peerDependencies: better-auth: 1.3.27 convex: '>=1.28.2 <1.35.0' - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@convex-dev/react-query@0.0.0-alpha.8': resolution: {integrity: sha512-Rv/q7/CplU75f7ckBd2vh+HoeeQ0tOrjwMl14Hk7D/03e55oUIU0TV5JYYzC79ZQyyAtoj7CmCo5ZxcmtKNv1Q==} @@ -16506,24 +16906,12 @@ packages: '@electric-sql/pglite@0.3.2': resolution: {integrity: sha512-zfWWa+V2ViDCY/cmUfRqeWY1yLto+EpxjXnZzenB1TyxsTiXaTWeZFIZw6mac52BsuQm0RjCnisjBtdBaXOI6w==} - '@emnapi/core@1.10.0': - resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} - - '@emnapi/core@1.11.1': - resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==} - '@emnapi/core@1.11.3': resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==} '@emnapi/core@1.4.5': resolution: {integrity: sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==} - '@emnapi/runtime@1.10.0': - resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} - - '@emnapi/runtime@1.11.1': - resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==} - '@emnapi/runtime@1.11.3': resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==} @@ -16533,12 +16921,6 @@ packages: '@emnapi/wasi-threads@1.0.4': resolution: {integrity: sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==} - '@emnapi/wasi-threads@1.2.1': - resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} - - '@emnapi/wasi-threads@1.2.2': - resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==} - '@emnapi/wasi-threads@1.2.3': resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==} @@ -16561,7 +16943,7 @@ packages: resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==} peerDependencies: '@types/react': '*' - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -16577,7 +16959,7 @@ packages: peerDependencies: '@emotion/react': ^11.0.0-rc.0 '@types/react': '*' - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -16588,7 +16970,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks@1.2.0': resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 '@emotion/utils@1.4.2': resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==} @@ -16639,12 +17021,6 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.28.2': - resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [aix] - '@esbuild/android-arm64@0.23.0': resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==} engines: {node: '>=18'} @@ -16681,12 +17057,6 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.28.2': - resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm@0.23.0': resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==} engines: {node: '>=18'} @@ -16723,12 +17093,6 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.28.2': - resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - '@esbuild/android-x64@0.23.0': resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==} engines: {node: '>=18'} @@ -16765,12 +17129,6 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.28.2': - resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - '@esbuild/darwin-arm64@0.23.0': resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==} engines: {node: '>=18'} @@ -16807,12 +17165,6 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.28.2': - resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-x64@0.23.0': resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==} engines: {node: '>=18'} @@ -16849,12 +17201,6 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.28.2': - resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - '@esbuild/freebsd-arm64@0.23.0': resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==} engines: {node: '>=18'} @@ -16891,12 +17237,6 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.28.2': - resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-x64@0.23.0': resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==} engines: {node: '>=18'} @@ -16933,12 +17273,6 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.28.2': - resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - '@esbuild/linux-arm64@0.23.0': resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==} engines: {node: '>=18'} @@ -16975,12 +17309,6 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.28.2': - resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm@0.23.0': resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==} engines: {node: '>=18'} @@ -17017,12 +17345,6 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.28.2': - resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - '@esbuild/linux-ia32@0.23.0': resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==} engines: {node: '>=18'} @@ -17059,12 +17381,6 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.28.2': - resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-loong64@0.23.0': resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==} engines: {node: '>=18'} @@ -17101,12 +17417,6 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.28.2': - resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-mips64el@0.23.0': resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==} engines: {node: '>=18'} @@ -17143,12 +17453,6 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.28.2': - resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==} - engines: {node: '>=18'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-ppc64@0.23.0': resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==} engines: {node: '>=18'} @@ -17185,12 +17489,6 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.28.2': - resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-riscv64@0.23.0': resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==} engines: {node: '>=18'} @@ -17227,12 +17525,6 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.28.2': - resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-s390x@0.23.0': resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==} engines: {node: '>=18'} @@ -17269,12 +17561,6 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.28.2': - resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-x64@0.23.0': resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==} engines: {node: '>=18'} @@ -17311,12 +17597,6 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.28.2': - resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - '@esbuild/netbsd-arm64@0.25.10': resolution: {integrity: sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==} engines: {node: '>=18'} @@ -17347,12 +17627,6 @@ packages: cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-arm64@0.28.2': - resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [netbsd] - '@esbuild/netbsd-x64@0.23.0': resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==} engines: {node: '>=18'} @@ -17389,12 +17663,6 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.28.2': - resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - '@esbuild/openbsd-arm64@0.23.0': resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==} engines: {node: '>=18'} @@ -17431,12 +17699,6 @@ packages: cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.28.2': - resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openbsd] - '@esbuild/openbsd-x64@0.23.0': resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==} engines: {node: '>=18'} @@ -17473,12 +17735,6 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.28.2': - resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - '@esbuild/openharmony-arm64@0.25.10': resolution: {integrity: sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==} engines: {node: '>=18'} @@ -17503,12 +17759,6 @@ packages: cpu: [arm64] os: [openharmony] - '@esbuild/openharmony-arm64@0.28.2': - resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openharmony] - '@esbuild/sunos-x64@0.23.0': resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==} engines: {node: '>=18'} @@ -17545,12 +17795,6 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.28.2': - resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - '@esbuild/win32-arm64@0.23.0': resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==} engines: {node: '>=18'} @@ -17587,12 +17831,6 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.28.2': - resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-ia32@0.23.0': resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==} engines: {node: '>=18'} @@ -17629,12 +17867,6 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.28.2': - resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-x64@0.23.0': resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==} engines: {node: '>=18'} @@ -17671,12 +17903,6 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.28.2': - resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==} - engines: {node: '>=18'} - cpu: [x64] - os: [win32] - '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -18030,8 +18256,8 @@ packages: '@floating-ui/react-dom@2.1.2': resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@floating-ui/utils@0.2.9': resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} @@ -18054,6 +18280,11 @@ packages: peerDependencies: hono: ^4 + '@hono/session@0.2.1': + resolution: {integrity: sha512-9bEkT8DnQDM0KNOrSokXMvx4wp1uLmopu0BCLrHjw5DMWPAEDcONuqyn/1dqosQktcNYA3HwUHGK8WT86JtnYA==} + peerDependencies: + hono: '>=4.0.0' + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -18094,6 +18325,12 @@ packages: cpu: [arm64] os: [darwin] + '@img/sharp-darwin-arm64@0.35.5': + resolution: {integrity: sha512-QRUlFQ0WxvdWyqqG/WtI3iupfD5rBzmCHXSdPsY91sAtVtTo7Q4cb6zOccZ3gqEqkr0f1As1ehLqmEpDsRf+lg==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [darwin] + '@img/sharp-darwin-x64@0.34.5': resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18106,11 +18343,22 @@ packages: cpu: [x64] os: [darwin] + '@img/sharp-darwin-x64@0.35.5': + resolution: {integrity: sha512-+BR255RhDlpygUpOc/Jdt1nT6DQ3XG/ERo5wbcdOf5Q320dKtPCKPLR1LJs9VGXRaMa8l1uUa0tkCNOXiAxZUw==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [darwin] + '@img/sharp-freebsd-wasm32@0.35.4': resolution: {integrity: sha512-lIsKw/BU+kjB4eZjxrYrZmwOJYi3Ajrv66iAlBmUPyKc3HpnloevB1g3wxGD9P/5BbQ1brBGl65VRRrCvQDEqA==} engines: {node: '>=20.9.0'} os: [freebsd] + '@img/sharp-freebsd-wasm32@0.35.5': + resolution: {integrity: sha512-Y/z91nEZ4uIBX5X3nfTovjU9lHNKFYbL2lpHCLVNmXQK03VIZvXBBt0KxbPGp2SdGSF+2mQU4e+hQaWOt86iAw==} + engines: {node: '>=20.9.0'} + os: [freebsd] + '@img/sharp-libvips-darwin-arm64@1.2.4': resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==} cpu: [arm64] @@ -18121,6 +18369,11 @@ packages: cpu: [arm64] os: [darwin] + '@img/sharp-libvips-darwin-arm64@1.3.4': + resolution: {integrity: sha512-5R89nBYiRdUlSWJxPhO+GVtaXzXSxKnRu/xqMn3KTA3L9EB9Oy/P+Nn2f2vlhPuUdy/Zusb2DarbyTpGCfEDuw==} + cpu: [arm64] + os: [darwin] + '@img/sharp-libvips-darwin-x64@1.2.4': resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==} cpu: [x64] @@ -18131,6 +18384,11 @@ packages: cpu: [x64] os: [darwin] + '@img/sharp-libvips-darwin-x64@1.3.4': + resolution: {integrity: sha512-iR2OKH80yi0U+dUplyh3/xdpFvps6YkCwsXenIJxqxR1v9o+xtKTGbS9H7cps+2Vxjc8B1j96p75NmTGjIhtpQ==} + cpu: [x64] + os: [darwin] + '@img/sharp-libvips-linux-arm64@1.2.4': resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==} cpu: [arm64] @@ -18143,6 +18401,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-arm64@1.3.4': + resolution: {integrity: sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-arm@1.2.4': resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==} cpu: [arm] @@ -18155,6 +18419,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-arm@1.3.4': + resolution: {integrity: sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==} + cpu: [arm] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-ppc64@1.2.4': resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==} cpu: [ppc64] @@ -18167,6 +18437,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-ppc64@1.3.4': + resolution: {integrity: sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-riscv64@1.2.4': resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==} cpu: [riscv64] @@ -18179,6 +18455,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-riscv64@1.3.4': + resolution: {integrity: sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-s390x@1.2.4': resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==} cpu: [s390x] @@ -18191,6 +18473,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-s390x@1.3.4': + resolution: {integrity: sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-x64@1.2.4': resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==} cpu: [x64] @@ -18203,6 +18491,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-x64@1.3.4': + resolution: {integrity: sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==} + cpu: [x64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linuxmusl-arm64@1.2.4': resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==} cpu: [arm64] @@ -18215,6 +18509,12 @@ packages: os: [linux] libc: [musl] + '@img/sharp-libvips-linuxmusl-arm64@1.3.4': + resolution: {integrity: sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==} + cpu: [arm64] + os: [linux] + libc: [musl] + '@img/sharp-libvips-linuxmusl-x64@1.2.4': resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==} cpu: [x64] @@ -18227,6 +18527,12 @@ packages: os: [linux] libc: [musl] + '@img/sharp-libvips-linuxmusl-x64@1.3.4': + resolution: {integrity: sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==} + cpu: [x64] + os: [linux] + libc: [musl] + '@img/sharp-linux-arm64@0.34.5': resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18241,6 +18547,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-arm64@0.35.5': + resolution: {integrity: sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-arm@0.34.5': resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18255,6 +18568,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-arm@0.35.5': + resolution: {integrity: sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==} + engines: {node: '>=20.9.0'} + cpu: [arm] + os: [linux] + libc: [glibc] + '@img/sharp-linux-ppc64@0.34.5': resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18269,6 +18589,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-ppc64@0.35.5': + resolution: {integrity: sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA==} + engines: {node: '>=20.9.0'} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-riscv64@0.34.5': resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18283,6 +18610,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-riscv64@0.35.5': + resolution: {integrity: sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==} + engines: {node: '>=20.9.0'} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-s390x@0.34.5': resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18297,6 +18631,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-s390x@0.35.5': + resolution: {integrity: sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==} + engines: {node: '>=20.9.0'} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@img/sharp-linux-x64@0.34.5': resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18311,6 +18652,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-x64@0.35.5': + resolution: {integrity: sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [linux] + libc: [glibc] + '@img/sharp-linuxmusl-arm64@0.34.5': resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18325,6 +18673,13 @@ packages: os: [linux] libc: [musl] + '@img/sharp-linuxmusl-arm64@0.35.5': + resolution: {integrity: sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [linux] + libc: [musl] + '@img/sharp-linuxmusl-x64@0.34.5': resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18339,6 +18694,13 @@ packages: os: [linux] libc: [musl] + '@img/sharp-linuxmusl-x64@0.35.5': + resolution: {integrity: sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [linux] + libc: [musl] + '@img/sharp-wasm32@0.34.5': resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18348,11 +18710,20 @@ packages: resolution: {integrity: sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA==} engines: {node: '>=20.9.0'} + '@img/sharp-wasm32@0.35.5': + resolution: {integrity: sha512-Ptsga1su4tQx+LLF1ECS9U6nz5kmrXKo6XVbtR48Ke3ZRxxgaWBu7IDtEe1quo8hiupwm6WFqxVlXaSf7IINGQ==} + engines: {node: '>=20.9.0'} + '@img/sharp-webcontainers-wasm32@0.35.4': resolution: {integrity: sha512-ESfNkywmCfPNyaZjxooddJQiQ+l/nTpGEOGthxiLnIHXC/CmcBixnfwUleX9mCz9ovrUUvKMap/pm8RYbzfwaA==} engines: {node: '>=20.9.0'} cpu: [wasm32] + '@img/sharp-webcontainers-wasm32@0.35.5': + resolution: {integrity: sha512-hfhF/FmoQyTUkA0bIKFOtw536BQSeBMe6BF6QyWlrPxT754+TFLaZ7sKKTfvvM0yJgKgaYTwnFCIZ/GuDw5SUA==} + engines: {node: '>=20.9.0'} + cpu: [wasm32] + '@img/sharp-win32-arm64@0.34.5': resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18365,6 +18736,12 @@ packages: cpu: [arm64] os: [win32] + '@img/sharp-win32-arm64@0.35.5': + resolution: {integrity: sha512-X4t7g+7ZA5DKblCBEXGjUqqemj4vczING/5viFwAL8h4N3qYeyjwdCvRLHi4EdOUI+2Z7UFlp1VM+p/AuEtm6Q==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [win32] + '@img/sharp-win32-ia32@0.34.5': resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18377,6 +18754,12 @@ packages: cpu: [ia32] os: [win32] + '@img/sharp-win32-ia32@0.35.5': + resolution: {integrity: sha512-5Zm82LoBc43nhwNybZlG7Y1KO//Zhsn306fQl29ZOuStHLGTo3BWL83q3cznX0poxSAMuYL1On/BHBxkBeKr6A==} + engines: {node: ^20.9.0} + cpu: [ia32] + os: [win32] + '@img/sharp-win32-x64@0.34.5': resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18389,6 +18772,12 @@ packages: cpu: [x64] os: [win32] + '@img/sharp-win32-x64@0.35.5': + resolution: {integrity: sha512-x76eH0vEiHlcMQu8Y8IenntaACtddpT6W0wmXtWrnKcnKI7ME5DdgqhAD6SEWOEl1v2zDvkZDhFA9KnURwpfqg==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [win32] + '@import-maps/resolve@2.0.0': resolution: {integrity: sha512-RwzRTpmrrS6Q1ZhQExwuxJGK1Wqhv4stt+OF2JzS+uawewpwNyU7EJL1WpBex7aDiiGLs4FsXGkfUBdYuX7xiQ==} @@ -18501,6 +18890,9 @@ packages: '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/sourcemap-codec@1.6.0': + resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==} + '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -18721,8 +19113,8 @@ packages: '@emotion/styled': ^11.3.0 '@mui/material-pigment-css': ^6.4.7 '@types/react': ^19.2.8 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@emotion/react': optional: true @@ -18738,7 +19130,7 @@ packages: engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -18749,7 +19141,7 @@ packages: peerDependencies: '@emotion/react': ^11.4.1 '@emotion/styled': ^11.3.0 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@emotion/react': optional: true @@ -18763,7 +19155,7 @@ packages: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@emotion/react': optional: true @@ -18785,7 +19177,7 @@ packages: engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -18803,18 +19195,6 @@ packages: '@napi-rs/wasm-runtime@0.2.4': resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==} - '@napi-rs/wasm-runtime@1.1.4': - resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 - - '@napi-rs/wasm-runtime@1.1.5': - resolution: {integrity: sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 - '@napi-rs/wasm-runtime@1.1.6': resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==} peerDependencies: @@ -18835,10 +19215,6 @@ packages: '@netlify/binary-info@1.0.0': resolution: {integrity: sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==} - '@netlify/blobs@10.1.0': - resolution: {integrity: sha512-dFpqDc6/x5LEu9L7kblCQu00CFEchH8J42jmQoXPuhKoE7avajzeLTbVKA8Olk3S/c2m9ejegrgbhL8NRA2Jyw==} - engines: {node: ^14.16.0 || >=16.0.0} - '@netlify/blobs@11.0.3': resolution: {integrity: sha512-Z8IXQtQC8BQjm76i1bN+l12TTyKQ/s1R92Ajhou7+fpP0KSxnJ65QzLEb5WuFuFutn8ORrcd4mlF8A2xhw8dzA==} engines: {node: '>=22.12.0'} @@ -18856,10 +19232,6 @@ packages: resolution: {integrity: sha512-Zu8cM4AeXNuQI/cNAI6vrammtdDnWIGO6PYKDAECDMzsb3IcoTsVOZAePup7cGdjaGcBBVdi1qx/PoI5hNZcxg==} engines: {node: '>=22.12.0'} - '@netlify/dev-utils@4.3.0': - resolution: {integrity: sha512-vZAL8pMuj3yPQlmHSgyaA/UQFxc6pZgU0LucFJ1+IPWGJtIzBXHRvuR4acpoP72HtyQPUHJ42s7U9GaaSGVNHg==} - engines: {node: ^18.14.0 || >=20} - '@netlify/dev-utils@6.0.1': resolution: {integrity: sha512-q5g70dO3q/M/XTBQz7uIECJxVlJoS8UBlzpjf22DV6q61UzXa8EONTPXPmvisrFcUi1I3AUKplPcHGQYZZj+Vw==} engines: {node: '>=22.12.0'} @@ -18919,10 +19291,6 @@ packages: resolution: {integrity: sha512-4Qpz6FpwrLITrScg34zjK9Iv0BiyyPVAGO7HvUZg0txihHPgKBRtLMByEwfP6mhuzTExoxMXYklqgHg2xtbPxA==} engines: {node: '>=22.12.0'} - '@netlify/runtime-utils@2.2.0': - resolution: {integrity: sha512-K3kWIxIMucibzQsATU2xw2JI+OpS9PZfPW/a+81gmeLC8tLv5YAxTVT0NFY/3imk1kcOJb9g7658jPLqDJaiAw==} - engines: {node: ^18.14.0 || >=20} - '@netlify/runtime-utils@3.0.0': resolution: {integrity: sha512-OHo40+V3QZkR+UrDjqhN+LekrAby/dSSJxsvyYs9i88E/mSl3goB/ysoL+VYROm190egxmQyRYlHK7vL4GeHBQ==} engines: {node: '>=22.12.0'} @@ -18961,7 +19329,7 @@ packages: peerDependencies: '@tanstack/react-start': workspace:* '@tanstack/solid-start': workspace:* - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@tanstack/react-start': optional: true @@ -18972,7 +19340,7 @@ packages: resolution: {integrity: sha512-63vL+KpnbfJv+xQSfOn37j8aSOWjiljeaFL9g/HY+YNJpDJ3Y5BPPW1VExx4dcPqXBkggBHm5Y6HpTvBeTSx3Q==} engines: {node: '>=22.12.0'} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@netlify/zip-it-and-ship-it@15.5.1': resolution: {integrity: sha512-ECHwLIHkSgfkxqF+q40xLMTTSxir1/pDGK6d55oKvwKidrW4qyTyHCAkuKtjOTJ30A+E238X2iiRyI+SCDjTuA==} @@ -19058,62 +19426,62 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@nx/devkit@23.2.0': - resolution: {integrity: sha512-srj04UsYqq2nG7Z9DxM00D8XpSpmSM7XQafCkD4FIOE2NPMCu0QvypJLe8S7a1/YAW9rqlnYrdadaQte687eAw==} + '@nx/devkit@24.0.0': + resolution: {integrity: sha512-t5E5VOCoNECLFMMp6qUczUx5kYduyvMMsHFGvuXPCKX32Ny4aFbeIrYNqCrsNKr9KgzMr0tOvRA+EMT0v7BXEA==} peerDependencies: - nx: '>= 22 <= 24 || ^23.0.0-0' + nx: '>= 23 <= 25 || ^24.0.0-0' - '@nx/nx-darwin-arm64@23.2.0': - resolution: {integrity: sha512-nael5WwtqBX/YZDU0iv8M4rJ8auF9kF+sU5pYpronIbvu/LdDptq31vWT06ivW8eXRaLxDqFmpXR8tS5IYDmdw==} + '@nx/nx-darwin-arm64@24.0.0': + resolution: {integrity: sha512-ZHXmqkMVF7aA6QShvc5lVkCU6JHjGV19m8eplw0pL06AFgNdQ9u16013HJPm+Ys6fKnltYDWl/Ef7meQjT+u3Q==} cpu: [arm64] os: [darwin] - '@nx/nx-darwin-x64@23.2.0': - resolution: {integrity: sha512-jZ7c6ktp8Wdroru6lj8WxvYDiK70B2cE3GdV9pcgCcVQvK6PLJXgOaHvQjALMINraYhzlsWX/FkWMy4eMMlJzg==} + '@nx/nx-darwin-x64@24.0.0': + resolution: {integrity: sha512-a+cpg/VQvD/vF7BJsl70vulc1GxCamtU0XwzkGOzzDATn3JcKBNpBFx0Iqp5frJYN0X00Supz4zhgCEe9LpCow==} cpu: [x64] os: [darwin] - '@nx/nx-freebsd-x64@23.2.0': - resolution: {integrity: sha512-5MDLl4q0kYZcX6CLu5x1YEq5YUUmo6CqoWApgC/2Ky2kEX9Kz+9fuTJlKlwwSlAxlb3TyQVKXrjGfwF0M30ygA==} + '@nx/nx-freebsd-x64@24.0.0': + resolution: {integrity: sha512-PAGVaLbJxEzBXSQvg82g/8mDoqoMQFIX/EchuJbJGekIiz3BM2Xgyiy5qAD2/2meLVOTFtbkBQR+4ZSymgqGWw==} cpu: [x64] os: [freebsd] - '@nx/nx-linux-arm-gnueabihf@23.2.0': - resolution: {integrity: sha512-YBY7VGEyrzWNPG6M1knOjykMbsHmX/uN5TywwtLYp2mp6PaDC9MNO9z2BDaVmdS+Y8u030RrDpESwLkB0f9d4g==} + '@nx/nx-linux-arm-gnueabihf@24.0.0': + resolution: {integrity: sha512-WOWBIlTb+1FNP86GcodUF4BHdjVyGCwrVH/lqUvNAmT/FPopirCzVLdoj1P5kfWC/F0II/qAu7X698yKzIu71A==} cpu: [arm] os: [linux] - '@nx/nx-linux-arm64-gnu@23.2.0': - resolution: {integrity: sha512-CzDkhtI+HYKGWPbjfMhslrgGpWer/qGd6MOFwkjxI8JYdqRV0BYivnAuqogsyPpBDNzalxK8xM55MD/f+edQ+w==} + '@nx/nx-linux-arm64-gnu@24.0.0': + resolution: {integrity: sha512-vASWIfOijXd5cdOn0Z6Wcd2iwtFxlBoBre6w+c8wuLLLPN3r4SRQyL+jAEB+eHkUHz39mMxSwa8DY+VlS9luVw==} cpu: [arm64] os: [linux] libc: [glibc] - '@nx/nx-linux-arm64-musl@23.2.0': - resolution: {integrity: sha512-poDmLBCX4WHcYwlklFingeqHVSaTdeUe5jhuQhR6BygDpFdVk4kibovEHh4A5LRkPag4SACNRy1VRBKoaoEyUA==} + '@nx/nx-linux-arm64-musl@24.0.0': + resolution: {integrity: sha512-ZiG9Kjq1AvYmFK3p03OOjCcYXwiBpF2Z7Ih/QnKsRMcnT7GbjDpfuO3FkSMtuE0OWoAdAt9Kb2yXBP3L9IZc6w==} cpu: [arm64] os: [linux] libc: [musl] - '@nx/nx-linux-x64-gnu@23.2.0': - resolution: {integrity: sha512-8E8IAkJJw1+eF9UNZKZnc1UDDNOmRaGQbb/AXL8Ix0MP3LObDjIyX9NLYxrtcb9HUcWrygcuKsySum+E5C4s3w==} + '@nx/nx-linux-x64-gnu@24.0.0': + resolution: {integrity: sha512-FstnaQtRkxD0RGYtCJb7QYq9Sgzu+vCKYO+p3/uq+q2kKLwlu4ovvzUeDctTuCIjx1tFamp/Uu8n+bHavUE7KQ==} cpu: [x64] os: [linux] libc: [glibc] - '@nx/nx-linux-x64-musl@23.2.0': - resolution: {integrity: sha512-X/i1GfhqeOM1pGNBDDeIDKhtpXKnYjBR8hv8YoVW9pHQXAJ2iUux6SCP1Gg5tIKUYTdZRvsknf0g7KEw3p1sug==} + '@nx/nx-linux-x64-musl@24.0.0': + resolution: {integrity: sha512-dBFcWaSOhl17ZzZ+ybi9ctPlYPwDTlJjGgkpV5e/O6D7V9MFziJ4xZG/mVgacYbW3f5HS6QRVno9yPtSyLj2MA==} cpu: [x64] os: [linux] libc: [musl] - '@nx/nx-win32-arm64-msvc@23.2.0': - resolution: {integrity: sha512-MSXbpHVSduWYnCu8MyPs88H6XnbU20jHWUvtPFDFkxgA8Slhl09hzpp2xq8TS4M8dS2OxK4QWcZyszqRMkwQrw==} + '@nx/nx-win32-arm64-msvc@24.0.0': + resolution: {integrity: sha512-u2t4v71qCT7Nj4QbxuJ8X3iii881goaXJ7fjTcYw4EhSk1FemF6lh7mlSaHSczQ+/JFbiVppu649NYaVlIxGcw==} cpu: [arm64] os: [win32] - '@nx/nx-win32-x64-msvc@23.2.0': - resolution: {integrity: sha512-OZKEU4d5YmOht1id5wyWhVfvuNEo0hl4DYRFzDh/r94nbTqfNEPcY0bTDfvtjZ79ZM5tPC1Z1k8/L4dkhMpFhw==} + '@nx/nx-win32-x64-msvc@24.0.0': + resolution: {integrity: sha512-Rv464/mLVw3lKdsxhFJXk3WI2KyaCoGbTNUzLi8nlzEuZ0ZcBK4VKxAxlvVCAVrxPIZkbUFDYE7vRvdZ2DGikg==} cpu: [x64] os: [win32] @@ -19187,12 +19555,14 @@ packages: '@opentelemetry/sdk-trace-base@2.10.0': resolution: {integrity: sha512-GuYQQT7QD2EeO8lcZLRQzcbOyhqAzL+6WWTKTU9mSUBYBazkEDl+VrQcXQhbB08OWM9anD1aHleVadzulpOaUQ==} engines: {node: ^18.19.0 || >=20.6.0} + deprecated: Use @opentelemetry/sdk-trace package peerDependencies: '@opentelemetry/api': '>=1.3.0 <1.10.0' '@opentelemetry/sdk-trace-node@2.10.0': resolution: {integrity: sha512-GZK/G6oZyBLGlH1pUgeDch7D91KoHd2uotUGIkWCPi9GI5T9X0p4L7nNAMDR1BQjkRYoDqo+ddfVx9t5Uhys+Q==} engines: {node: ^18.19.0 || >=20.6.0} + deprecated: Use @opentelemetry/sdk-trace package peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.10.0' @@ -19206,138 +19576,8 @@ packages: resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==} engines: {node: '>=14'} - '@oxc-minify/binding-android-arm-eabi@0.110.0': - resolution: {integrity: sha512-43fMTO8/5bMlqfOiNSZNKUzIqeLIYuB9Hr1Ohyf58B1wU11S2dPGibTXOGNaWsfgHy99eeZ1bSgeIHy/fEYqbw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [android] - - '@oxc-minify/binding-android-arm64@0.110.0': - resolution: {integrity: sha512-5oQrnn9eK/ccOp80PTrNj0Vq893NPNNRryjGpOIVsYNgWFuoGCfpnKg68oEFcN8bArizYAqw4nvgHljEnar69w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@oxc-minify/binding-darwin-arm64@0.110.0': - resolution: {integrity: sha512-dqBDgTG9tF2z2lrZp9E8wU+Godz1i8gCGSei2eFKS2hRploBOD5dmOLp1j4IMornkPvSQmbwB3uSjPq7fjx4EA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@oxc-minify/binding-darwin-x64@0.110.0': - resolution: {integrity: sha512-U0AqabqaooDOpYmeeOye8wClv8PSScELXgOfYqyqgrwH9J9KrpCE1jL8Rlqgz68QbL4mPw3V6sKiiHssI4CLeQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@oxc-minify/binding-freebsd-x64@0.110.0': - resolution: {integrity: sha512-H0w8o/Wo1072WSdLfhwwrpFpwZnPpjQODlHuRYkTfsSSSJbTxQtjJd4uxk7YJsRv5RQp69y0I7zvdH6f8Xueyw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@oxc-minify/binding-linux-arm-gnueabihf@0.110.0': - resolution: {integrity: sha512-qd6sW0AvEVYZhbVVMGtmKZw3b1zDYGIW+54Uh42moWRAj6i4Jhk/LGr6r9YNZpOINeuvZfkFuEeDD/jbu7xPUA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-minify/binding-linux-arm-musleabihf@0.110.0': - resolution: {integrity: sha512-7WXP0aXMrWSn0ScppUBi3jf68ebfBG0eri8kxLmBOVSBj6jw1repzkHMITJMBeLr5d0tT/51qFEptiAk2EP2iA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-minify/binding-linux-arm64-gnu@0.110.0': - resolution: {integrity: sha512-LYfADrq5x1W5gs+u9OIbMbDQNYkAECTXX0ufnAuf3oGmO51rF98kGFR5qJqC/6/csokDyT3wwTpxhE0TkcF/Og==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-arm64-musl@0.110.0': - resolution: {integrity: sha512-53GjCVY8kvymk9P6qNDh6zyblcehF5QHstq9QgCjv13ONGRnSHjeds0PxIwiihD7h295bxsWs84DN39syLPH4Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-linux-ppc64-gnu@0.110.0': - resolution: {integrity: sha512-li8XcN81dxbJDMBESnTgGhoiAQ+CNIdM0QGscZ4duVPjCry1RpX+5FJySFbGqG3pk4s9ZzlL/vtQtbRzZIZOzg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-riscv64-gnu@0.110.0': - resolution: {integrity: sha512-SweKfsnLKShu6UFV8mwuj1d1wmlNoL/FlAxPUzwjEBgwiT2HQkY24KnjBH+TIA+//1O83kzmWKvvs4OuEhdIEQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-riscv64-musl@0.110.0': - resolution: {integrity: sha512-oH8G4aFMP8XyTsEpdANC5PQyHgSeGlopHZuW1rpyYcaErg5YaK0vXjQ4EM5HVvPm+feBV24JjxgakTnZoF3aOQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-linux-s390x-gnu@0.110.0': - resolution: {integrity: sha512-W9na+Vza7XVUlpf8wMt4QBfH35KeTENEmnpPUq3NSlbQHz8lSlSvhAafvo43NcKvHAXV3ckD/mUf2VkqSdbklg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-x64-gnu@0.110.0': - resolution: {integrity: sha512-XJdA4mmmXOjJxSRgNJXsDP7Xe8h3gQhmb56hUcCrvq5d+h5UcEi2pR8rxsdIrS8QmkLuBA3eHkGK8E27D7DTgQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-x64-musl@0.110.0': - resolution: {integrity: sha512-QqzvALuOTtSckI8x467R4GNArzYDb/yEh6aNzLoeaY1O7vfT7SPDwlOEcchaTznutpeS9Dy8gUS/AfqtUHaufw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-openharmony-arm64@0.110.0': - resolution: {integrity: sha512-gAMssLs2Q3+uhLZxanh1DF+27Kaug3cf4PXb9AB7XK81DR+LVcKySXaoGYoOs20Co0fFSphd6rRzKge2qDK3dA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@oxc-minify/binding-wasm32-wasi@0.110.0': - resolution: {integrity: sha512-7Wqi5Zjl022bs2zXq+ICdalDPeDuCH/Nhbi8q2isLihAonMVIT0YH2hqqnNEylRNGYck+FJ6gRZwMpGCgrNxPg==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-minify/binding-win32-arm64-msvc@0.110.0': - resolution: {integrity: sha512-ZPx+0Tj4dqn41ecyoGotlvekQKy6JxJCixn9Rw7h/dafZ3eDuBcEVh3c2ZoldXXsyMIt5ywI8IWzFZsjNedd5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@oxc-minify/binding-win32-ia32-msvc@0.110.0': - resolution: {integrity: sha512-H0Oyd3RWBfpEyvJIrFK94RYiY7KKSQl11Ym7LMDwLEagelIAfRCkt1amHZhFa/S3ZRoaOJFXzEw4YKeSsjVFsg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ia32] - os: [win32] - - '@oxc-minify/binding-win32-x64-msvc@0.110.0': - resolution: {integrity: sha512-Hr3nK90+qXKJ2kepXwFIcNfQQIOBecB4FFCyaMMypthoEEhVP08heRynj4eSXZ8NL9hLjs3fQzH8PJXfpznRnQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - - '@oxc-project/types@0.115.0': - resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==} - - '@oxc-project/types@0.132.0': - resolution: {integrity: sha512-FESMOxil5Se014ui/Eq8fT5uHJo6nIRwH0PfJrZJXs6Gek3ZVFOrpUv3YIZT20m+extU98Hg1Ym72U58rlsxUQ==} + '@oxc-project/types@0.153.0': + resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==} '@oxc-resolver/binding-android-arm-eabi@11.19.1': resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==} @@ -19447,133 +19687,6 @@ packages: cpu: [x64] os: [win32] - '@oxc-transform/binding-android-arm-eabi@0.110.0': - resolution: {integrity: sha512-sE9dxvqqAax1YYJ3t7j+h5ZSI9jl6dYuDfngl6ieZUrIy5P89/8JKVgAzgp8o3wQSo7ndpJvYsi1K4ZqrmbP7w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [android] - - '@oxc-transform/binding-android-arm64@0.110.0': - resolution: {integrity: sha512-nqtbP4aMCtsCZ6qpHlHaQoWVHSBtlKzwaAgwEOvR+9DWqHjk31BHvpGiDXlMeed6CVNpl3lCbWgygb3RcSjcfw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@oxc-transform/binding-darwin-arm64@0.110.0': - resolution: {integrity: sha512-oeSeHnL4Z4cMXtc8V0/rwoVn0dgwlS9q0j6LcHn9dIhtFEdp3W0iSBF8YmMQA+E7sILeLDjsHmHE4Kp0sOScXw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@oxc-transform/binding-darwin-x64@0.110.0': - resolution: {integrity: sha512-nL9K5x7OuZydobAGPylsEW9d4APs2qEkIBLMgQPA+kY8dtVD3IR87QsTbs4l4DBQYyun/+ay6qVCDlxqxdX2Jg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@oxc-transform/binding-freebsd-x64@0.110.0': - resolution: {integrity: sha512-GS29zXXirDQhZEUq8xKJ1azAWMuUy3Ih3W5Bc5ddk12LRthO5wRLFcKIyeHpAXCoXymQ+LmxbMtbPf84GPxouw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@oxc-transform/binding-linux-arm-gnueabihf@0.110.0': - resolution: {integrity: sha512-glzDHak8ISyZJemCUi7RCvzNSl+MQ1ly9RceT2qRufhUsvNZ4C/2QLJ1HJwd2N6E88bO4laYn+RofdRzNnGGEA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-transform/binding-linux-arm-musleabihf@0.110.0': - resolution: {integrity: sha512-8JThvgJ2FRoTVfbp7e4wqeZqCZbtudM06SfZmNzND9kPNu/LVYygIR+72RWs+xm4bWkuYHg/islo/boNPtMT5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-transform/binding-linux-arm64-gnu@0.110.0': - resolution: {integrity: sha512-IRh21Ub/g4bkHoErZ0AUWMlWfoZaS0A6EaOVtbcY70RSYIMlrsbjiFwJCzM+b/1DD1rXbH5tsGcH7GweTbfRqg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-arm64-musl@0.110.0': - resolution: {integrity: sha512-e5JN94/oy+wevk76q+LMr+2klTTcO60uXa+Wkq558Ms7mdF2TvkKFI++d/JeiuIwJLTi/BxQ4qdT5FWcsHM/ug==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-linux-ppc64-gnu@0.110.0': - resolution: {integrity: sha512-Y3/Tnnz1GvDpmv8FXBIKtdZPsdZklOEPdrL6NHrN5i2u54BOkybFaDSptgWF53wOrJlTrcmAVSE6fRKK9XCM2Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-riscv64-gnu@0.110.0': - resolution: {integrity: sha512-Y0E35iA9/v9jlkNcP6tMJ+ZFOS0rLsWDqG6rU9z+X2R3fBFJBO9UARIK6ngx8upxk81y1TFR2CmBFhupfYdH6Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-riscv64-musl@0.110.0': - resolution: {integrity: sha512-JOUSYFfHjBUs7xp2FHmZHb8eTYD/oEu0NklS6JgUauqnoXZHiTLPLVW2o2uVCqldnabYHcomuwI2iqVFYJNhTw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-linux-s390x-gnu@0.110.0': - resolution: {integrity: sha512-7blgoXF9D3Ngzb7eun23pNrHJpoV/TtE6LObwlZ3Nmb4oZ6Z+yMvBVaoW68NarbmvNGfZ95zrOjgm6cVETLYBA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-x64-gnu@0.110.0': - resolution: {integrity: sha512-YQ2joGWCVDZVEU2cD/r/w49hVjDm/Qu1BvC/7zs8LvprzdLS/HyMXGF2oA0puw0b+AqgYaz3bhwKB2xexHyITQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-x64-musl@0.110.0': - resolution: {integrity: sha512-fkjr5qE632ULmNgvFXWDR/8668WxERz3tU7TQFp6JebPBneColitjSkdx6VKNVXEoMmQnOvBIGeP5tUNT384oA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-openharmony-arm64@0.110.0': - resolution: {integrity: sha512-HWH9Zj+lMrdSTqFRCZsvDWMz7OnMjbdGsm3xURXWfRZpuaz0bVvyuZNDQXc4FyyhRDsemICaJbU1bgeIpUJDGw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@oxc-transform/binding-wasm32-wasi@0.110.0': - resolution: {integrity: sha512-ejdxHmYfIcHDPhZUe3WklViLt9mDEJE5BzcW7+R1vc5i/5JFA8D0l7NUSsHBJ7FB8Bu9gF+5iMDm6cXGAgaghw==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-transform/binding-win32-arm64-msvc@0.110.0': - resolution: {integrity: sha512-9VTwpXCZs7xkV+mKhQ62dVk7KLnLXtEUxNS2T4nLz3iMl1IJbA4h5oltK0JoobtiUAnbkV53QmMVGW8+Nh3bDQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@oxc-transform/binding-win32-ia32-msvc@0.110.0': - resolution: {integrity: sha512-5y0fzuNON7/F2hh2P94vANFaRPJ/3DI1hVl5rseCT8VUVqOGIjWaza0YS/D1g6t1WwycW2LWDMi2raOKoWU5GQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ia32] - os: [win32] - - '@oxc-transform/binding-win32-x64-msvc@0.110.0': - resolution: {integrity: sha512-QROrowwlrApI1fEScMknGWKM6GTM/Z2xwMnDqvSaEmzNazBsDUlE08Jasw610hFEsYAVU2K5sp/YaCa9ORdP4A==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - '@panva/hkdf@1.2.1': resolution: {integrity: sha512-6oclG6Y3PiDFcoyk8srjLfVKyMfVCKJ27JwNPViuXziFpmdz+MZnZN/aKY0JGXgYuO/VghU0jcOAZgWXZ1Dmrw==} @@ -19736,18 +19849,12 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} - '@poppinss/colors@4.1.5': - resolution: {integrity: sha512-FvdDqtcRCtz6hThExcFOgW0cWX+xwSMWcRuQe5ZEb2m7cVQOAVZOIMt+/v9RxGiD9/OY16qJBXK4CVKWAPalBw==} - '@poppinss/colors@4.1.6': resolution: {integrity: sha512-H9xkIdFswbS8n1d6vmRd8+c10t2Qe+rZITbbDHHkQixH5+2x1FDGmi/0K+WgWiqQFKPSlIYB7jlH6Kpfn6Fleg==} '@poppinss/dumper@0.6.5': resolution: {integrity: sha512-NBdYIb90J7LfOI32dOewKI1r7wnkiH6m920puQ3qHUeZkxNkQiFnXVWoE6YtFSv6QOiPPf7ys6i+HWWecDz7sw==} - '@poppinss/dumper@0.7.0': - resolution: {integrity: sha512-0UTYalzk2t6S4rA2uHOz5bSSW2CHdv4vggJI6Alg90yvl0UgXs6XSXpH96OH+bRkX4J/06djv29pqXJ0lq5Kag==} - '@poppinss/exception@1.2.2': resolution: {integrity: sha512-m7bpKCD4QMlFCjA/nKTs23fuvoVFoA83brRKmObCUNmi/9tVu8Ve3w4YQAnJu4q3Tjf5fr685HYIC/IA2zHRSg==} @@ -19806,8 +19913,8 @@ packages: resolution: {integrity: sha512-SXCcgFvo/SC6/11kEOaQghJgCWNEWZUvPYKn/gpvMB9HLSG/5M8If7dWZtEQHhchvl8bh9A89Hw6mEKpsXFimA==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -19857,8 +19964,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19870,8 +19977,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19883,8 +19990,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19896,8 +20003,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19909,8 +20016,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19922,8 +20029,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19935,8 +20042,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19948,8 +20055,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19961,8 +20068,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19973,7 +20080,7 @@ packages: resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19983,8 +20090,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -19995,7 +20102,7 @@ packages: resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20005,8 +20112,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20017,7 +20124,7 @@ packages: resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20027,8 +20134,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20040,8 +20147,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20052,7 +20159,7 @@ packages: resolution: {integrity: sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20062,8 +20169,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20075,8 +20182,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20088,8 +20195,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20100,7 +20207,7 @@ packages: resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20110,8 +20217,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20123,8 +20230,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20136,8 +20243,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20149,8 +20256,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20162,8 +20269,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20175,8 +20282,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20188,8 +20295,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20201,8 +20308,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20214,8 +20321,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20227,8 +20334,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20240,8 +20347,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20253,8 +20360,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20266,8 +20373,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20279,8 +20386,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20292,8 +20399,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20305,8 +20412,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20317,7 +20424,7 @@ packages: resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20327,8 +20434,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20340,8 +20447,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20353,8 +20460,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20366,8 +20473,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20379,8 +20486,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20392,8 +20499,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20405,8 +20512,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20417,7 +20524,7 @@ packages: resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20426,7 +20533,7 @@ packages: resolution: {integrity: sha512-YnEXIy8/ga01Y1PN0VfaNH//MhA91JlEGVBDxDzROqwrAtG5Yr2QGEPz8A/rJA3C7ZAHryOYGaUv8fLSW2H/mg==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20435,7 +20542,7 @@ packages: resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20444,7 +20551,7 @@ packages: resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20453,7 +20560,7 @@ packages: resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20462,7 +20569,7 @@ packages: resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20471,7 +20578,7 @@ packages: resolution: {integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20481,8 +20588,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -20497,200 +20604,106 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true '@types/react-dom': optional: true - '@rolldown/binding-android-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-lcJL0bN5hpgJfSIz/8PIf02irmyL43P+j1pTCfbD1DbLkmGRuFIA4DD3B3ZOvGqG0XiVvRznbKtN0COQVaKUTg==} + '@rolldown/binding-android-arm-eabi@1.2.13': + resolution: {integrity: sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@rolldown/binding-android-arm64@1.2.13': + resolution: {integrity: sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-android-arm64@1.0.2': - resolution: {integrity: sha512-ZS4D1JPGn/MYQN/SYDWftIE/nVsM8j/AFOYEzAoOE2O3NktQOZru+/vYXGbR/qtdLdIfGCP0lcoJiYVzsEz+iQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@rolldown/binding-darwin-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-J7Zk3kLYFsLtuH6U+F4pS2sYVzac0qkjcO5QxHS7OS7yZu2LRs+IXo+uvJ/mvpyUljDJ3LROZPoQfgBIpCMhdQ==} + '@rolldown/binding-darwin-arm64@1.2.13': + resolution: {integrity: sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-arm64@1.0.2': - resolution: {integrity: sha512-vdFA9+C/rekyGce7WqHs/xoT0ioZEWaOFyZLIV1mEeNFaFDUQrPIo8Vs2GvJ6eetb3rzDUtUBgzto3ExpXJB3w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@rolldown/binding-darwin-x64@1.0.0-rc.9': - resolution: {integrity: sha512-iwtmmghy8nhfRGeNAIltcNXzD0QMNaaA5U/NyZc1Ia4bxrzFByNMDoppoC+hl7cDiUq5/1CnFthpT9n+UtfFyg==} + '@rolldown/binding-darwin-x64@1.2.13': + resolution: {integrity: sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.2': - resolution: {integrity: sha512-BewSOwTHazv77DTYiAZXSqqKZ4KP/KonFisDMVU7PImxoWfB2aepnPhd2E4SWz3zDzYgDNbs6jBmTdgNnF02GA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@rolldown/binding-freebsd-x64@1.0.0-rc.9': - resolution: {integrity: sha512-DLFYI78SCiZr5VvdEplsVC2Vx53lnA4/Ga5C65iyldMVaErr86aiqCoNBLl92PXPfDtUYjUh+xFFor40ueNs4Q==} + '@rolldown/binding-freebsd-x64@1.2.13': + resolution: {integrity: sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-freebsd-x64@1.0.2': - resolution: {integrity: sha512-m41o7M0YWtUdqk61Tb+jnKb2rN++iRdIASlExkUoKfIAH30DOHCB8fVLzSUpbWHHU8esmEioY62PxzexE8MBuA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': - resolution: {integrity: sha512-CsjTmTwd0Hri6iTw/DRMK7kOZ7FwAkrO4h8YWKoX/kcj833e4coqo2wzIFywtch/8Eb5enQ/lwLM7w6JX1W5RQ==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.13': + resolution: {integrity: sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm-gnueabihf@1.0.2': - resolution: {integrity: sha512-jcojB9H7W/jS29pMKWAK1N+fU99vXodHDTatS3b3y/XSOCiHo0kkA74pL3jJmkoQtYpOCxDvaKs1fo2Ij/1X5w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-2x9O2JbSPxpxMDhP9Z74mahAStibTlrBMW0520+epJH5sac7/LwZW5Bmg/E6CXuEF53JJFW509uP+lSedaUNxg==} + '@rolldown/binding-linux-arm64-gnu@1.2.13': + resolution: {integrity: sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-arm64-gnu@1.0.2': - resolution: {integrity: sha512-1jn6qDU5iiOgFgygDzKUuKP0maTi0/f1+sBLgvij/76C77Nm3ts6ufz9Bjg5q5dduxiUIxtq86JIoBvo1xQ4Ig==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': - resolution: {integrity: sha512-JA1QRW31ogheAIRhIg9tjMfsYbglXXYGNPLdPEYrwFxdbkQCAzvpSCSHCDWNl4hTtrol8WeboCSEpjdZK8qrCg==} + '@rolldown/binding-linux-arm64-musl@1.2.13': + resolution: {integrity: sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@rolldown/binding-linux-arm64-musl@1.0.2': - resolution: {integrity: sha512-QVLO/czFMdoMFSqlX3bcswcJNm/23r+qoa/jgtmFc/qEp6/jXmIkDjF/XIo8dPfGaiwy1xfQn8o77L79GeXFgw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-aOKU9dJheda8Kj8Y3w9gnt9QFOO+qKPAl8SWd7JPHP+Cu0EuDAE5wokQubLzIDQWg2myXq2XhTpOVS07qqvT+w==} + '@rolldown/binding-linux-ppc64-gnu@1.2.13': + resolution: {integrity: sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-ppc64-gnu@1.0.2': - resolution: {integrity: sha512-hgO5Abm0w5UL6FEa2iFnZqo2KlK7TQ5QhV5x09hujBf7t5KzHQ1VmfPuTpqRy/rNlSxua3eWH374xxiVrP+lcA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-OalO94fqj7IWRn3VdXWty75jC5dk4C197AWEuMhIpvVv2lw9fiPhud0+bW2ctCxb3YoBZor71QHbY+9/WToadA==} + '@rolldown/binding-linux-s390x-gnu@1.2.13': + resolution: {integrity: sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@rolldown/binding-linux-s390x-gnu@1.0.2': - resolution: {integrity: sha512-fy8rXxuYEu602abC8MUNaPjYLIFzReOaEIEMKMUa0rFEUxNpVXhs15KSSQ4qlqSaM7B6rcj9rDZgADh/IGDzLQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-cVEl1vZtBsBZna3YMjGXNvnYYrOJ7RzuWvZU0ffvJUexWkukMaDuGhUXn0rjnV0ptzGVkvc+vW9Yqy6h8YX4pg==} + '@rolldown/binding-linux-x64-gnu@1.2.13': + resolution: {integrity: sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.0.2': - resolution: {integrity: sha512-0+bOkiQ779+r1WpoHOWHqncvyySci0vKph+myNDYb+im6meJAzHQXay6oEgnkHuUGouM1LKTZwqKpBow6Kj7CQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': - resolution: {integrity: sha512-UzYnKCIIc4heAKgI4PZ3dfBGUZefGCJ1TPDuLHoCzgrMYPb5Rv6TLFuYtyM4rWyHM7hymNdsg5ik2C+UD9VDbA==} + '@rolldown/binding-linux-x64-musl@1.2.13': + resolution: {integrity: sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@rolldown/binding-linux-x64-musl@1.0.2': - resolution: {integrity: sha512-mjSkrzZK5Qsl0a9d1JgILOiuZOSDTVdKENcSXBoqbzSrspLR/4/IRVDo5wd2GgZjNss/viBFJdeq+j7qH2nypw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-+6zoiF+RRyf5cdlFQP7nm58mq7+/2PFaY2DNQeD4B87N36JzfF/l9mdBkkmTvSYcYPE8tMh/o3cRlsx1ldLfog==} + '@rolldown/binding-openharmony-arm64@1.2.13': + resolution: {integrity: sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-openharmony-arm64@1.0.2': - resolution: {integrity: sha512-1v5vHasdfQAZoEHakBV72LIFAC9JjnymsiKxp+GEr/ma3+NJCPSaYK+qavInOovJkgwFrs7GccX2d6IgDA3Z5w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@rolldown/binding-wasm32-wasi@1.0.0-rc.9': - resolution: {integrity: sha512-rgFN6sA/dyebil3YTlL2evvi/M+ivhfnyxec7AccTpRPccno/rPoNlqybEZQBkcbZu8Hy+eqNJCqfBR8P7Pg8g==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@rolldown/binding-wasm32-wasi@1.0.2': - resolution: {integrity: sha512-mb1VobWn6NheziTk5/WEaR6AKVbrwT5sOi6C7zk3gy/pD1qtJfU1j4PgTo2NJnOtbL9Dl3Aeei8w9jJ7qC2jZQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [wasm32] - - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': - resolution: {integrity: sha512-lHVNUG/8nlF1IQk1C0Ci574qKYyty2goMiPlRqkC5R+3LkXDkL5Dhx8ytbxq35m+pkHVIvIxviD+TWLdfeuadA==} + '@rolldown/binding-win32-arm64-msvc@1.2.13': + resolution: {integrity: sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-arm64-msvc@1.0.2': - resolution: {integrity: sha512-SqKonF56vA/L2yHwHYcEp2P34URpOZ7d1fS635cTkpDnUtEGdUbhI6NzsPdqeSWvAAeGDrxjWjNmibDIdFf9/A==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': - resolution: {integrity: sha512-G0oA4+w1iY5AGi5HcDTxWsoxF509hrFIPB2rduV5aDqS9FtDg1CAfa7V34qImbjfhIcA8C+RekocJZA96EarwQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.2': - resolution: {integrity: sha512-v7qRI7gXLRINcOGXt+7YmAZ6iFuyZVMIoXAxhd8oP+DR9dLfL9GfNIx7PLMxmhZdvq8waUJBQiWN9EKNy+TRBQ==} + '@rolldown/binding-win32-x64-msvc@1.2.13': + resolution: {integrity: sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -20703,7 +20716,7 @@ packages: '@babel/plugin-transform-runtime': ^7.29.0 || ^8.0.0-rc.1 '@babel/runtime': ^7.27.0 || ^8.0.0-rc.1 rolldown: ^1.0.0-rc.5 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@babel/plugin-transform-runtime': optional: true @@ -20712,9 +20725,6 @@ packages: vite: optional: true - '@rolldown/pluginutils@1.0.0-beta.27': - resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} - '@rolldown/pluginutils@1.0.0-rc.2': resolution: {integrity: sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==} @@ -20727,69 +20737,6 @@ packages: '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} - '@rollup/plugin-alias@6.0.0': - resolution: {integrity: sha512-tPCzJOtS7uuVZd+xPhoy5W4vThe6KWXNmsFCNktaAh5RTqcLiSfT4huPQIXkgJ6YCOjJHvecOAzQxLFhPxKr+g==} - engines: {node: '>=20.19.0'} - peerDependencies: - rollup: '>=4.0.0' - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-commonjs@29.0.3': - resolution: {integrity: sha512-ZaOxZceP7SOUW7Lqw5IRVweSQYWaeIPnXIGLiB690EBA3FGJTO40EEr2L5yZplJWsgTCogILRSpcAe7+U0Otdg==} - engines: {node: '>=16.0.0 || 14 >= 14.17'} - peerDependencies: - rollup: ^2.68.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-inject@5.0.5': - resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-json@6.1.0': - resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-node-resolve@16.0.3': - resolution: {integrity: sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.78.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-replace@6.0.3': - resolution: {integrity: sha512-J4RZarRvQAm5IF0/LwUUg+obsm+xZhYnbMXmXROyoSE1ATJe3oXSb9L5MMppdxP2ylNSjv6zFBwKYjcKMucVfA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - - '@rollup/plugin-terser@1.0.0': - resolution: {integrity: sha512-FnCxhTBx6bMOYQrar6C8h3scPt8/JwIzw3+AJ2K++6guogH5fYaIFia+zZuhqv0eo1RN7W1Pz630SyvLbDjhtQ==} - engines: {node: '>=20.0.0'} - peerDependencies: - rollup: ^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - '@rollup/pluginutils@5.1.4': resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} engines: {node: '>=14.0.0'} @@ -20937,28 +20884,8 @@ packages: cpu: [x64] os: [win32] - '@rsbuild/core@2.0.14': - resolution: {integrity: sha512-SSPer6vM+v82CV6JXIOzyyT++A1ECgsVvvUuveD5rfGxX/W58vWGnB+zWcYbMfYOjTntD+9ve6QGGh6kBjPx6A==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - core-js: '>= 3.0.0' - peerDependenciesMeta: - core-js: - optional: true - - '@rsbuild/core@2.1.1': - resolution: {integrity: sha512-s6Cc+pHCJK9RP6Yk4LwsQWHxxxasrk5kmo9nkZK7j1iObp4w2PLivsUdP6HtkeoXuxcnK3QKH8/r49plNBjaQw==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - core-js: '>= 3.0.0' - peerDependenciesMeta: - core-js: - optional: true - - '@rsbuild/core@2.2.5': - resolution: {integrity: sha512-nf34ri1iZduYhHUr5Vc79L7Eml+IlN0nFIaF/g3OW4WR/gShxuf5wVXS69/H8FTHJYN4SdYlNcefSZQluEMKgA==} + '@rsbuild/core@2.3.1': + resolution: {integrity: sha512-dv5tL7djb8ex5z4sqnDmUbd5PnGNr/CXuFfiMD4RkUsF1JEZZkGH8lc+QW4fqYQIHM7RTvcMUakgvwVU/O9WMw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -20983,6 +20910,14 @@ packages: '@rsbuild/core': optional: true + '@rsbuild/plugin-sass@2.0.1': + resolution: {integrity: sha512-BZRpVTZW+za+sv84nYYdIjR7XwVqyS8+1wAha/7BvQ1igdzlmT6xPd6h4jTWfNzdHuzIHZsuWY7kPS/ybzcndA==} + peerDependencies: + '@rsbuild/core': ^2.0.0 + peerDependenciesMeta: + '@rsbuild/core': + optional: true + '@rsbuild/plugin-solid@1.1.1': resolution: {integrity: sha512-IMlxjAVDrgPPx7KHQXyiJiQn5x11jibC7WIVIkZg7uxkcgBuHyE6InmVNc+C6M3Y1djXYL7GG2M7CH4Jdg+RUw==} peerDependencies: @@ -21015,280 +20950,168 @@ packages: '@rsbuild/core': optional: true - '@rspack/binding-darwin-arm64@2.0.0': - resolution: {integrity: sha512-ICBHDKYyndFqljLhjxvKfWWZu39RJSH2jkSmbceXl0kmptLSE0cLWpvk+eGSzLqtxKN0jVchwCw+5P5mWCzwAw==} + '@rspack/binding-darwin-arm64@2.2.7': + resolution: {integrity: sha512-m0ijteZwZfUZeFcbyxwTe6N+I7aceV5/iW39b7fIIoMN/mSv9zL0ieeRzwuFe7mTYGwCuwNieDZHXfMFdp2Q2w==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-arm64@2.0.8': - resolution: {integrity: sha512-vCgbgH7B7qom+uID+RCZsTCOYFb9wC4/4+1U6rMfytrXGVJ72eNQs2tbdjOl0lb18CT3N/n+VkWynUiLk84GwA==} + '@rspack/binding-darwin-arm64@2.3.1': + resolution: {integrity: sha512-koLyL2r8PUcLD0StjuZ/n5XM6GJ0C8dzJN0IuIV9d7nQcibJxwjjSAWEPGVz6bm8WuzypvuVKNoa1+GGAHeMQA==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-arm64@2.1.1': - resolution: {integrity: sha512-6K8jA3pZphBwLt5DU78wl0IzY1myHrqNSvFVCd9CHa+szlOwv2iMQpZdYdpupIBxwiZ39rrDyQKtoZw7lsAG8w==} - cpu: [arm64] - os: [darwin] - - '@rspack/binding-darwin-arm64@2.2.3': - resolution: {integrity: sha512-MGLx4lMTY6XEtJi55S+fk83+683GeUDuoqzjixbq6ehHdr/l6nGiHhgvMtV5DYt9sCytUDzyrCkcJ0AWqJxnTA==} - cpu: [arm64] - os: [darwin] - - '@rspack/binding-darwin-x64@2.0.0': - resolution: {integrity: sha512-YQ96LMmzIzhZt9cZWUDWXSxS9UWWHWoLxJyZ5f42DSaVPVelBg5ThbVORDwOP5QDA2xFXj60rVnmmcZLzg/aDA==} + '@rspack/binding-darwin-x64@2.2.7': + resolution: {integrity: sha512-f27/OubIeCe5Hzze1bm+k/CQ2XX9hk3E/FuK4lym1bjqZ9spWSuolC3sK/yU/Pc3kwMPuf53byUm3FM+QC/blw==} cpu: [x64] os: [darwin] - '@rspack/binding-darwin-x64@2.0.8': - resolution: {integrity: sha512-satPm2PD4B7jDTVlVAdvMVdUszwLvWUEnUDzLb77mvVkezKNDZmuhb+e8s+FfKs8hJpNbZ9VAejuA2rr8o985w==} + '@rspack/binding-darwin-x64@2.3.1': + resolution: {integrity: sha512-YK39JLiu1YC6+3BMxkP7e848pHD7e2T/0OSNogDi7whfiZNg95wa9Ncd7I5ppAf0nhmV+FNew/sCBIFp5h67Jw==} cpu: [x64] os: [darwin] - '@rspack/binding-darwin-x64@2.1.1': - resolution: {integrity: sha512-RdqtEfIbSe5ucLNVvMac1k88UwmL4Gil8uXqlEFcSZ3VC2jTOkecadd+B0RYqJ+PirSInrRmKm1cr0740zppOA==} - cpu: [x64] - os: [darwin] - - '@rspack/binding-darwin-x64@2.2.3': - resolution: {integrity: sha512-5B/c1YTYEz9m7TyqtGQgTmXMr9PoPewyqsyHB4N0AB7nxDhtgmki0GniP2Lqtx3LJzOvQMjwet+I2lmWxvxwCg==} - cpu: [x64] - os: [darwin] - - '@rspack/binding-linux-arm64-gnu@2.0.0': - resolution: {integrity: sha512-Ufn33gzkIV7JY69k6vJQEdOzRvBqThIgH46pwXksHSMwRZp8IbJhXfyYIAVsRWCk8fXpr9t1nAvCDvJXT2EeyA==} + '@rspack/binding-linux-arm64-gnu@2.2.7': + resolution: {integrity: sha512-uGEX6kY/Pi3wPZgaEk6vTevZOHjKw8qmd5pqWVwRmpLhwvPB7LGqVqx5BMnNYBjsndVUWJQQRlGL8DoVG5IXXQ==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-gnu@2.0.8': - resolution: {integrity: sha512-pSI+npPQE/uDtiboqvcOIRJbEV2+B+H1xffmko/gw50la92oTUW60kVULFwsb6L0+GVCzIcwX3yq60GtYIn+Ug==} + '@rspack/binding-linux-arm64-gnu@2.3.1': + resolution: {integrity: sha512-Q+RCA/KM2tn6m6R5U4lktXDs5cCRm3SyleQk86iqqUFX7wKzVRUvr5BTsreg6K9of3gpYmQ6+g1PGT5cwo0rLA==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-gnu@2.1.1': - resolution: {integrity: sha512-ROKtqXoLpbZO1vYEcNxQg6COvRhdlJcoib1Z4pzG1nIyctEAUuFmnD7pIvJiVe6M7YuJNXW+1p0BhpptT2XEUQ==} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@rspack/binding-linux-arm64-gnu@2.2.3': - resolution: {integrity: sha512-sU+jPGD2xz3BxFvsdBQVGce538YHqrSKMB4ZSfKhj6RSKjeGzpJ1BVl8+IndiQsfTgaUxi7N+r5cs/ezGy1TVQ==} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@rspack/binding-linux-arm64-musl@2.0.0': - resolution: {integrity: sha512-CZbvFKlNY9UC0C+Czz6i8JFCzGpuL9oX8gEqcJA1+84Y6eEEBH50UiTzeCewxKW3dOofkZdvT5vgNMXz6aMUmg==} + '@rspack/binding-linux-arm64-musl@2.2.7': + resolution: {integrity: sha512-qBvztXsOgdi69zi8BhIUz+yc/alqR/wQVmcdCh+1SbhcsNpMsFUndxvVoR1tOboBsEo//gxOG4GxH8zlemhbUA==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-arm64-musl@2.0.8': - resolution: {integrity: sha512-igjJ43yxWQ72GZqjDDZSSHax9/Vg+6rLMmOvFglTJUkQpB4Tyvu/YjW+WRjYj2xRw6blOjLxUSJWASvuSqqlvg==} + '@rspack/binding-linux-arm64-musl@2.3.1': + resolution: {integrity: sha512-He+muVDON1fohGtdYamh3zHVwf6/E6fZu/+iEAkxjclE0P94bsCfYVcZW/a4/l1tJ2zvLZtB4jD7Qr6r4vG/WA==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-arm64-musl@2.1.1': - resolution: {integrity: sha512-QdQpG9dK0GfPASjBd/8rUwDNW0ShfFfYJfcoGLNTM6A8EqmgvWwklXDiCVF5dXALbZIksAuRznIKnLDsUoXi9Q==} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@rspack/binding-linux-arm64-musl@2.2.3': - resolution: {integrity: sha512-EQuADbqWbVgNAh5ep/u/B7Z/8UUkZjMLzHAOKZJklBpe4Y8mnhFNjieX0xc9NadR+drj9tqmEANxzTOkFtVPyQ==} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@rspack/binding-linux-ppc64-gnu@2.2.3': - resolution: {integrity: sha512-kyXROzr519a5juBII9ysuc5ZD2apEZ0DJqL5PPCAOVHjzMfThEIBwnX3gicNCmp+kY0CCIOl2LagwbtFaOzoiA==} + '@rspack/binding-linux-ppc64-gnu@2.2.7': + resolution: {integrity: sha512-t+/tOPoMu3ZZF8I1Wvqd4Jrib1teOOgb0S4jGb4nSVryuDIWgjny0FLGv5xc8RC7e4esVF93D4wF62Kt9Pxfvw==} cpu: [ppc64] os: [linux] libc: [glibc] - '@rspack/binding-linux-riscv64-gnu@2.1.1': - resolution: {integrity: sha512-LGdYCAvblZp2qtHk9UseYftIRyaBzSWqEzd1toaS08sYESXERm+YBbrYKKiyq1yXiU1L7BkhMUxiWc3GCYmKcA==} + '@rspack/binding-linux-ppc64-gnu@2.3.1': + resolution: {integrity: sha512-blIZUgyPt4FcSHkZL6sJ2xbzc7ACgDeU49An4mXLSebwdgnlhTzxeSFnh2VeJDlGza8CUaZYB/zS/6oZ2kCDcw==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@rspack/binding-linux-riscv64-gnu@2.2.7': + resolution: {integrity: sha512-ZkN6K4PRTPqfYI7gPYv1PqgUXKsZDeeFPFoQ4LLiFxhIGczdJY5XAPPoHN+N7d91hAGWi6u+UHYrUp1HvudBOw==} cpu: [riscv64] os: [linux] libc: [glibc] - '@rspack/binding-linux-riscv64-gnu@2.2.3': - resolution: {integrity: sha512-F3x6Nu0RUSoLtiaMse3hYQ3Nf5A2de6vTWWDXj14Ll6BpGWXGn+U/eXT/nB199fFnDEYf+CJEa7d6fzcYdwdjA==} + '@rspack/binding-linux-riscv64-gnu@2.3.1': + resolution: {integrity: sha512-3FtW2DUFmXxhBORUA3zSc+ot4d6R/1/U6z/48TDN4jeIYDUG9VqYBF6LUohX4vBY6IP0DCyXb2N9WayD/9QXoA==} cpu: [riscv64] os: [linux] libc: [glibc] - '@rspack/binding-linux-riscv64-musl@2.1.1': - resolution: {integrity: sha512-87phiiPGFT1p4gy3Oz6YdNijCPXdjJy43LFdE8AFiZsV4ChFXQPqnVCF2aMRLybYa51A+9wGYlTvxt09yUQUww==} + '@rspack/binding-linux-riscv64-musl@2.2.7': + resolution: {integrity: sha512-ywcmeNAC59HtVJ4a5jy5cEUA4JNa19QlVtTW09Pzh0+luNEasWaDfOaXJpYJTGWcycVwzMm3A9aNN3MqvO87EQ==} cpu: [riscv64] os: [linux] libc: [musl] - '@rspack/binding-linux-riscv64-musl@2.2.3': - resolution: {integrity: sha512-O3HK7OnPvoBxZu4MX2j+t3gk4qiUsFYqj/29L3WgU1iQsdUSIN6PInW2JvbiLqyuzt09VltIEXTKayY8EysCpQ==} + '@rspack/binding-linux-riscv64-musl@2.3.1': + resolution: {integrity: sha512-+5qNgdNdXzp/K8f8BjgJ3m7tcbBKPENN7WPDfBcSHvWb5GF4+o/pbrX26c0+LEugo0bYUOAoitBNd94AwcNvpA==} cpu: [riscv64] os: [linux] libc: [musl] - '@rspack/binding-linux-s390x-gnu@2.2.3': - resolution: {integrity: sha512-SIxfGdwBdAjwJ8pDlPTb8MPIZIv/i2lKHn4/ywuDpFOxlUA4Bo/OKqQOenHx2MFD2mN8jigBZQTF0KVe5YP1uQ==} + '@rspack/binding-linux-s390x-gnu@2.2.7': + resolution: {integrity: sha512-U/np+nOj9mka5CdM9FKNkrAShw0UoaarBLzOxbBHu4sqMt3iXQCi91fblLdhUDoWuIQrnV/WrqygFeIP2qAHIw==} cpu: [s390x] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.0.0': - resolution: {integrity: sha512-dPjFGpoCvZfFpJBsWAUR+PR7mWYxpou6L026qIOpAVkz7WiTzErwKD3P1jVrpP4dM9yLb3fVE+PHHjTglhTJ4g==} + '@rspack/binding-linux-s390x-gnu@2.3.1': + resolution: {integrity: sha512-yNcg/y1+MV0wZ984CVU4d1HAYYwMcDPXoQO0xynU+K5YuBxPWALHOxuRRCKCcykBdL1GIEshAIewEFrsW/cmJg==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@rspack/binding-linux-x64-gnu@2.2.7': + resolution: {integrity: sha512-PkryZX3GZeBQfzvKEhwGGd9m43PwqcsqWd14kmsVADeBCqHLxJahMGiGmajd28vSa42xbw7HTb8yY4jXzv5QtA==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.0.8': - resolution: {integrity: sha512-zrkoEOnqj1hOEBO5T2I/2Ts2HSJsYFh1qXwMpK4dMJFGGNWDfNeUa6/LF5uq3VINF3JUl7RL47AgrucoSZJXPA==} + '@rspack/binding-linux-x64-gnu@2.3.1': + resolution: {integrity: sha512-ffclKBuH8wwimOBd6xGUxrBfVKKY5Ow4E7OFdHZeg4xffm2O8auGszmOgvFu1eoDoOYHaVJn+cEV6UD0KwZk8A==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.1.1': - resolution: {integrity: sha512-om0/PvZzxISsnyz3hdmI3xBi3Qsn6faRGrfp6WJpGHa5JYYaRVWz1MJ9fe+/cQE9ON9r32HpMOeuataCLv+Owg==} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@rspack/binding-linux-x64-gnu@2.2.3': - resolution: {integrity: sha512-IzQGcw09WYn/IzwB1SQpg7FQ211MBr+fJB2/WoRrPS6CNdtlkDHZaI8z2oq+2Oc5Su21jgX75VlWFajirUx5Dw==} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@rspack/binding-linux-x64-musl@2.0.0': - resolution: {integrity: sha512-4fgDTMWt0mJDiugdia2mdOjTbnm7yM1Drzl1JpPqlUlOr113byOhc+qgN57LURSGypz2yz/h/Zad7/UnVAxYJw==} + '@rspack/binding-linux-x64-musl@2.2.7': + resolution: {integrity: sha512-atJn62IgXnc/RhWiFgEiNx7IHAJbHunttzjMpWJLjWiFuJ2c+tLQrTBIiqO3VAIXh+haN1jZLHXuMVj5/J+edA==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-linux-x64-musl@2.0.8': - resolution: {integrity: sha512-6CtDaGZjNDvJd9TBp7a9zABbrPORO21W96+3ZcGBn0YNUPUk4ARxIxrTTpeJ/1F41QDM8AYIkGDdqEYMqTYBsA==} + '@rspack/binding-linux-x64-musl@2.3.1': + resolution: {integrity: sha512-qcDwwuyxR7TMtrW+r5Y9RIW25boXd1Ip/9jz04jhdq/OiU/Am7rCP2X90CH8sWdzovIF9UNmsGjY4KklR0F2Mg==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-linux-x64-musl@2.1.1': - resolution: {integrity: sha512-YgAyTOM5ZWvWT0Exwcg7QkGUv9PsHT4yIsEyJbH+a99uAKliGMwkHIOP/aJgrCF8G+lTfigY2wyl9cWo4TA4aw==} - cpu: [x64] - os: [linux] - libc: [musl] - - '@rspack/binding-linux-x64-musl@2.2.3': - resolution: {integrity: sha512-9OKSx2ickrR+PFal94XE6Hkj49AQ2HI3KuR9XeRkKOwSxjwrskV/Pn1wc2itDOHkm/QHP7k+MttsYb4FGuNIqw==} - cpu: [x64] - os: [linux] - libc: [musl] - - '@rspack/binding-wasm32-wasi@2.0.0': - resolution: {integrity: sha512-ANk73ZKtPrZf9gdtyRK2nQUfhi1uXoC5P2KF89pyVAE8+zcoLBnYtZGYpWa/cmNi5BcO5g4Z+v2l1UA3bUPLQQ==} + '@rspack/binding-wasm32-wasi@2.2.7': + resolution: {integrity: sha512-SRDYrqWnD8Y+VNj8+11KggFaVMFSbyu+9WC2f9sygzjFu78GmF0kLKaHNQMaJv6MUMSBk/OhtEbUB4hmH7czVQ==} cpu: [wasm32] - '@rspack/binding-wasm32-wasi@2.0.8': - resolution: {integrity: sha512-Yf4SiqTUroT5Ju+te0YAY2xxKOb35tECsO21v7hYyGa705wrgoAK/MmF7enOvs9GR1iZIqgiLD/wxsIxl8GjJw==} + '@rspack/binding-wasm32-wasi@2.3.1': + resolution: {integrity: sha512-3dr6zjFaCK3A920ftCriSJkiRhEfhHtat7LtBdj6g0mcV5Rt+iealmli0vjeAvD0UdpE1u8EKWlfw82JLgFLSQ==} cpu: [wasm32] - '@rspack/binding-wasm32-wasi@2.1.1': - resolution: {integrity: sha512-OicgaB3Dcd+KXsH/I3DkJG7XQyREJScg/jLkCtycFn9BhT0IVJvgi37F8QNJKl8Bp9YZIGehsqK9HpQWav6SLw==} - cpu: [wasm32] - - '@rspack/binding-wasm32-wasi@2.2.3': - resolution: {integrity: sha512-gici3jWJi0GDy9kbYh57LoA57H8A2EAD9cV2jFKp1YoJ2aX2U9lANh4L+xoKPTvVQYpRvleoA5jkAvyfeLQ5bw==} - cpu: [wasm32] - - '@rspack/binding-win32-arm64-msvc@2.0.0': - resolution: {integrity: sha512-IHZFRtJ85ONbM+BCtF4TeYXS2Fu9X0IJS2phX1rPibYq9iEtHGfBt4cNlnsJPhbPAXVvi4Oli/yiLRJ1zxtCIg==} + '@rspack/binding-win32-arm64-msvc@2.2.7': + resolution: {integrity: sha512-etHFjzSP/jnnrVYuim9C/nhSlN0/tQowVz0CSJOUHtDH7ZZiUsvWtkH9Zx3tDaZOB7sAw9cbL36mbmdkb4U6cw==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-arm64-msvc@2.0.8': - resolution: {integrity: sha512-8NCuiQsAhXrwRBy57QZoypqrws/zLBkaQVGiB8hksr6v++8hNigNjqpQARLbd0iyMuHsQQ++8+auGk6xlDXmzw==} + '@rspack/binding-win32-arm64-msvc@2.3.1': + resolution: {integrity: sha512-AZbuLPylt1xvWssN93AsirbYs3WgfcrA8tMsqHmVJIHahLu9E+JPKZ3Gmsw6IYEZk3EfnV3ujQzeQ1/VfF0Vsw==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-arm64-msvc@2.1.1': - resolution: {integrity: sha512-fwL4P3SsC0r/vVGgnmexnc4vkvf+9vWMcGw5fdlPBJNR/zWlZRSXR5V6eXcHrpYVLhBsLYvZYE3NZa9paIUGxw==} - cpu: [arm64] - os: [win32] - - '@rspack/binding-win32-arm64-msvc@2.2.3': - resolution: {integrity: sha512-1MG66kcuqAGFs9ewiBc+/NJSTQr1jHrkZ2nCVMyhukl1o8embmFZa3BCibYgBYs5P7FRc6Sa+CDXcrfDZOLInQ==} - cpu: [arm64] - os: [win32] - - '@rspack/binding-win32-ia32-msvc@2.0.0': - resolution: {integrity: sha512-n4tbIqacq/FhNJflMlgZV50AeQFTLh5hnDS3v4W+rJWa3IW1VfgB0+XppdeW+Dqhw7QcMIsCmro01kwNdlXZDQ==} + '@rspack/binding-win32-ia32-msvc@2.2.7': + resolution: {integrity: sha512-26HiMUQk8QKVw477gW9HorIQ3r0le3AL4OFigJr1/HAumi5qyOPazck+wWtUDh1R9bSf8etZjkuseBGtjN5+KQ==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.0.8': - resolution: {integrity: sha512-bxiekytbX7V9KFAra+HkwtNWC6pYfHEBBZFpiT0xUs3mCFOmAAFVBsBSQsoCP9AdCEXoMAvNdnrHNw3iov4OZw==} + '@rspack/binding-win32-ia32-msvc@2.3.1': + resolution: {integrity: sha512-R5NVU68TePZcgRdYUzrQX9YFNxmcyXZEPwaPv40AAgsqNyacG3iRaYVmV79jt3rWYfa0QJaqvRLUchDe2SZ6zQ==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.1.1': - resolution: {integrity: sha512-j3BISXbjPyI57HeHxW9Jx+UP7RebNQ4t62uCbRP29caf9aghYJP+ZA5nJ2X7pol7N5Je2/V6WNahuNd0zQFDOA==} - cpu: [ia32] - os: [win32] - - '@rspack/binding-win32-ia32-msvc@2.2.3': - resolution: {integrity: sha512-CAigxxh9DYJmEwH9f6FRkSsmt0GhKVqKaFRVFFrF9WDL7gXP3hyE/h/cCeMdmlTzRt8Mht87AvnDX7PG3neMrA==} - cpu: [ia32] - os: [win32] - - '@rspack/binding-win32-x64-msvc@2.0.0': - resolution: {integrity: sha512-cJOgikIW2t3S+42TQZsv+DJriJt2m6lnUk+pUFu/fO93rrMvNrx8gfMxR8W5zDTreBX0cfMx2pw6EVmyi/YzsQ==} + '@rspack/binding-win32-x64-msvc@2.2.7': + resolution: {integrity: sha512-ut8tVSXP8DWQE/JUwQ1oqwuAaAgySgYF66HpWmxfR9J4nLzGmhd7CnnaCTT3vUyQQNmLKFida/AbiqJ/gWmPrw==} cpu: [x64] os: [win32] - '@rspack/binding-win32-x64-msvc@2.0.8': - resolution: {integrity: sha512-7zPs8YCe/ZVJTwd+5lpB0CP0tkn2pONf/T1ycmVY76u21Nrwt8mXQGc/2yH2eWP4B7fikYBr3hGr7mpR2fajqQ==} + '@rspack/binding-win32-x64-msvc@2.3.1': + resolution: {integrity: sha512-5T9DYjNPQpLbrNXjCssGd2B6xMQPlc3LxVOKHGUA1O0GV+88vBkTXAcryJ+Fo+yVEMPCzp4VvwBMGAVDpCjcSA==} cpu: [x64] os: [win32] - '@rspack/binding-win32-x64-msvc@2.1.1': - resolution: {integrity: sha512-aPNNFuZT5iBM8+S9J4P5ywJbf3tUvZN3Ppe6mXJ8/jTVDUDhe0YVj3AgD/AuxnUvl+yHrLfQkN1nNwUfIcomfA==} - cpu: [x64] - os: [win32] + '@rspack/binding@2.2.7': + resolution: {integrity: sha512-opY7Sw6iwtBa23CeNj18GOqKBlaJUZXp52kNIGyNq+7jpCQKrJYeX5wiK7uBn8/ZpHQfhwNL2xxu5yzG4JFH1g==} - '@rspack/binding-win32-x64-msvc@2.2.3': - resolution: {integrity: sha512-qa5Wc34a+Uux5foZ1Z+9fPQceVRbgTunaIulHezVF/ZxvqKO4DkAC7tFl53shB0YRVBAPg8R78MGd8cByfoxLQ==} - cpu: [x64] - os: [win32] + '@rspack/binding@2.3.1': + resolution: {integrity: sha512-pfCJGBFNK2tnNnoDP6ZoTbOjxbKr1U2eGFDJ8bIuZQai4FBNhWQlKFmNup+X5K935XYRulZBomIBAL6GL6W2YQ==} - '@rspack/binding@2.0.0': - resolution: {integrity: sha512-WA2f9eQpejkvf5Vrnf6wNCn1m8RT1p08NjgOZpKhsCzr0uBjWeRvGduawlrFFHZh/jPnWZTVaVdQ08FEAWbwGw==} - - '@rspack/binding@2.0.8': - resolution: {integrity: sha512-3uZ+y8aQxq33ty2srMxg2Nu0XuBI6vVrG50rkDaXqwWqOohfgGUSfFuQK7EnSUNy4aFUQlCG6NHialQHJov0wg==} - - '@rspack/binding@2.1.1': - resolution: {integrity: sha512-6062hZP33fn1w51ClpQnum19GGXl/3eS754xrRYbQ7wwBNZk94HVwfSyiqcNCtY/pB1lsFjnaTKiW/Q+jv0axQ==} - - '@rspack/binding@2.2.3': - resolution: {integrity: sha512-532+T5N6yIdukChiL85H4NFN2vn9oi8wlLa1ByPNtpNYriE9s24fUhn0RiK7w/xACqnNpYmXCqLYCvjOzyCy+w==} - - '@rspack/core@2.0.0': - resolution: {integrity: sha512-WD1mJM9LbZ7Z399Rbv9dE3BNEV0+3sE5OzDdzV8hOxUb3mX++ynK5n9kil8w60B6nGdcKeV9ly5aN4PgqiwWUg==} - engines: {node: ^20.19.0 || >=22.12.0} - peerDependencies: - '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 - '@swc/helpers': '>=0.5.1' - peerDependenciesMeta: - '@module-federation/runtime-tools': - optional: true - '@swc/helpers': - optional: true - - '@rspack/core@2.0.8': - resolution: {integrity: sha512-+NLGJf8gZxihDmMFzjlly3toc2SMjeDmuvz0/Cai9AMdV4F+Pqcnt2BA9V4e3SY2jmhJQtPwgyyLtR1RiJO77g==} + '@rspack/core@2.2.7': + resolution: {integrity: sha512-kWKd4lYp13GPAQy2eQITLTvPbl+ST7ffG/MCGHoX138o5eTetMQMe/oc7UAZAfjervAM6UOzEhiiCirPTpRBUQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 @@ -21299,20 +21122,8 @@ packages: '@swc/helpers': optional: true - '@rspack/core@2.1.1': - resolution: {integrity: sha512-Rgz6xZcD0rm7ejZhYNi13qvW2dSnIQQt/7D3xbYoT5hOU838JbkF0P3SAMFGKE+FyLZswnyRpxGfnYHZQqDmJA==} - engines: {node: ^20.19.0 || >=22.12.0} - peerDependencies: - '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 - '@swc/helpers': ^0.5.23 - peerDependenciesMeta: - '@module-federation/runtime-tools': - optional: true - '@swc/helpers': - optional: true - - '@rspack/core@2.2.3': - resolution: {integrity: sha512-VHejw+PDd5B5v6VduFyjLSTIFaHBMNGPMKw+Y0zjkMqjYhDD1hjLOBC5frRKjTWcfYdk+Q73auWPp9k/H9PfIQ==} + '@rspack/core@2.3.1': + resolution: {integrity: sha512-9BWfaiEJLgLK9U53Q4WVruBZ19Mu/XWHXHEu0UFla4lUtH8Z+/ET2m044tiqbtyIgqQyG58fMrxHeVIAiXMXHg==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 @@ -21453,7 +21264,7 @@ packages: resolution: {integrity: sha512-vMfGz7x3Ahplcdm0RlEtTNUZ08qpUSr3NRJMQ6duUDxxe0Mqo6DisyQWNQKSROZ7BtLCJUfio6/LRGpkRUoo8A==} engines: {node: '>=18'} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 '@sentry/solid@10.32.0': resolution: {integrity: sha512-T+i0L+uB67Z+ttJJwETLQuXhBOor3mC82YqXBBxFX8H4hLZ0Idpbuw2Vmqd5+E1vQFxgsoHnuu3uBR6LblafFQ==} @@ -21508,10 +21319,6 @@ packages: resolution: {integrity: sha512-7F/yz2IphV39hiS2zB4QYVkivrptHHh0K8qJJd9HhuWSdvf8AN7NpebW3CcDZDBQsUPMoDKWsY2WWgW7bqOcfA==} engines: {node: '>=18'} - '@sindresorhus/merge-streams@4.0.0': - resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} - engines: {node: '>=18'} - '@so-ric/colorspace@1.1.6': resolution: {integrity: sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==} @@ -21959,7 +21766,7 @@ packages: '@tailwindcss/vite@4.2.2': resolution: {integrity: sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@tailwindcss/webpack@4.3.1': resolution: {integrity: sha512-HM33EjYPbkMlBGcYoVA/pk/hML3wAn2JOnjF79eDWVLuktOhRczDwWsSBQBOWV6LLBVAgGZS/pZ519OHUF8vKg==} @@ -22044,37 +21851,37 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@tanstack/react-query-devtools@5.67.2': resolution: {integrity: sha512-cmj2DxBc+/9btQ66n5xI8wTtAma2BLVa403K7zIYiguzJ/kV201jnGensYqJeu1Rd8uRMLLRM74jLVMLDWNRJA==} peerDependencies: '@tanstack/react-query': ^5.102.0 - react: ^19.2.3 + react: ~19.2.9 '@tanstack/react-query-devtools@5.90.2': resolution: {integrity: sha512-vAXJzZuBXtCQtrY3F/yUNJCV4obT/A/n81kb3+YqLbro5Z2+phdAbceO+deU3ywPw8B42oyJlp4FhO0SoivDFQ==} peerDependencies: '@tanstack/react-query': ^5.102.0 - react: ^19.2.3 + react: ~19.2.9 '@tanstack/react-query@5.102.0': resolution: {integrity: sha512-0GyVyEcGt9M7jHPCua16hNVtstUXE2R4HsnNubFYcDs7DJaLzh1dSiXsADDU/cNn/SqrLfa0vRKyjUmbx4rZLA==} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 - '@tanstack/react-store@0.11.1': - resolution: {integrity: sha512-HaIGKI3YLmjBYIvy5DFDY23oNaYZIsTZfngey07Uh5iLVJgM3bIGCnZeOFOqzjFld9JHWcaHJnasD/bKoGKwJQ==} + '@tanstack/react-store@0.11.2': + resolution: {integrity: sha512-oj5O5DmiMWE+ih+SioX2ayC1kbK7d3fpLx0B75fPJr9nY3zU+hoW010yr64qXsY/9fyiLVE2bn5mGNV3owm8RQ==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@tanstack/react-virtual@3.13.0': resolution: {integrity: sha512-CchF0NlLIowiM2GxtsoKBkXA4uqSnY2KvnXo+kyUFD4a4ll6+J0qzoRsUPMwXV/H26lRsxgJIr/YmjYum2oEjg==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@tanstack/solid-devtools@0.7.14': resolution: {integrity: sha512-hyaB29d1fU2n9v2XeFEB6t2k5gKionK8mxxb9MNtF7qJheZ6z9259jU8OsBdA/f6v2oYck1K1Ia9+ooJsdy4jg==} @@ -22098,8 +21905,8 @@ packages: peerDependencies: solid-js: 1.9.12 - '@tanstack/store@0.11.1': - resolution: {integrity: sha512-mzTOBhypOuDJAy/D8n2MfUZ1HFkXnmSETviRyhqEC8LUE7/IZQExOTxMANj3KjTofYTkFNpBY67qaVrT41YccA==} + '@tanstack/store@0.11.2': + resolution: {integrity: sha512-sJ4mjol8uQsHV0gOJzzjwXfh2Fwm+Sz0+8deqiTm4jGbMdjzNSW+xZCFm0kUa870uhd8yi+DpKnZb5Kc4apa0Q==} '@tanstack/virtual-core@3.13.0': resolution: {integrity: sha512-NBKJP3OIdmZY3COJdWkSonr50FMVIi+aj5ZJ7hI/DTpEKg2RMfo/KvP8A3B/zOSpMgIe52B5E2yn7rryULzA6g==} @@ -22114,7 +21921,7 @@ packages: resolution: {integrity: sha512-cTswDmoTn5UZA5pV2z/IWhGYgb8NS0zPRYYLv5q9JxHY4WxL/l/Riy6Aq76QttH8w6IHAIO/ZGwHBfF/OV0Kcw==} engines: {node: '>=18'} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@tanstack/vue-query-devtools@5.91.0': resolution: {integrity: sha512-Kn6p5ffEKUj+YGEP+BapoPI8kUiPtNnFDyzjTvUx6GHbyfzfefQPhYoRtFiWeyrGHjUB/Mvtnr7Rosbzs/ngVg==} @@ -22137,8 +21944,8 @@ packages: '@vue/composition-api': optional: true - '@tanstack/vue-store@0.11.1': - resolution: {integrity: sha512-0YmYwbiCQKhzfFTLpHybjoAVUh3GkQVYGguvGTzk/0wx0oWuni60huvRs1RqqRLJH6nig3PTYuLuQQ+X5s05gA==} + '@tanstack/vue-store@0.11.2': + resolution: {integrity: sha512-wZmkfsvc0dNvOg/Xb/a7uTPKejleI0dR3HHi0t3ZyVM/23MJ7AC0bH6C7rp2seSY4mIYo0pLLbGJGZ/UpO93Zw==} peerDependencies: '@vue/composition-api': ^1.2.1 vue: ^2.5.0 || ^3.0.0 @@ -22163,6 +21970,16 @@ packages: resolution: {integrity: sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} + '@testing-library/jest-dom@7.0.1': + resolution: {integrity: sha512-oMDTC3oA+6CXSO2JZnvOI7CA6oVub6kij5ggk9ohwye5slmkwxYDXcPOVxgMw/RQlticjtO0C1RZkR97HgrWMw==} + engines: {node: '>=22', npm: '>=6', yarn: '>=1'} + peerDependencies: + '@testing-library/dom': '>=10 <11' + vitest: '>= 0.32' + peerDependenciesMeta: + vitest: + optional: true + '@testing-library/react@16.2.0': resolution: {integrity: sha512-2cSskAvA1QNtKc8Y9VJQRv0tm3hLVgxRGDB+KYhIaPQJ1I+RHbhIXcM+zClKXzMes/wshsMVzf4B9vS4IZpqDQ==} engines: {node: '>=18'} @@ -22170,8 +21987,8 @@ packages: '@testing-library/dom': ^10.0.0 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -22185,8 +22002,8 @@ packages: '@testing-library/dom': ^10.0.0 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -22220,13 +22037,10 @@ packages: '@tanstack/react-query': ^5.102.0 '@trpc/client': 11.4.3 '@trpc/server': 11.4.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 typescript: '>=5.7.2' - '@tybys/wasm-util@0.10.2': - resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==} - '@tybys/wasm-util@0.10.3': resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==} @@ -22366,9 +22180,6 @@ packages: '@types/react@19.2.9': resolution: {integrity: sha512-Lpo8kgb/igvMIPeNV2rsYKTgaORYdO1XGVZ4Qz3akwOj0ySGYMPlQWa8BaLn0G63D1aSaAQ5ldR06wCpChQCjA==} - '@types/resolve@1.20.2': - resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - '@types/retry@0.12.2': resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==} @@ -22405,12 +22216,6 @@ packages: '@types/ws@8.5.14': resolution: {integrity: sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==} - '@types/yargs-parser@21.0.3': - resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==} - - '@types/yargs@17.0.33': - resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} - '@typescript-eslint/eslint-plugin@8.44.1': resolution: {integrity: sha512-molgphGqOBT7t4YKCSkbasmu1tb1MgrZ2szGzHbclF7PNmOkSTQVHy+2jXOSnxvR3+Xe1yySHFZoqMpz3TfQsw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -22837,42 +22642,31 @@ packages: cpu: [x64] os: [win32] - '@vercel/nft@1.11.0': - resolution: {integrity: sha512-m1QFg+U+3yPOnP1xSYJ73UIRxLOXdts1JOhiOiyPYqEsALgrXFFINvgUaD6R6iNvaBFAjHllBCbkfx4FuOdpaA==} - engines: {node: '>=20'} - hasBin: true - '@vercel/nft@1.3.1': resolution: {integrity: sha512-ihNT1rswiq3cy4WKQAV5kJi6UjWX1vLUzlLc+Vvq83G8CU9nMgfDWz5f1tOnSlS8LeC4Wp4qTB3+HGj/ccUrFQ==} engines: {node: '>=20'} hasBin: true - '@vitejs/plugin-react@4.7.0': - resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - vite: ^8.0.14 - '@vitejs/plugin-react@6.0.1': resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 babel-plugin-react-compiler: ^1.0.0 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@rolldown/plugin-babel': optional: true babel-plugin-react-compiler: optional: true - '@vitejs/plugin-rsc@0.5.30': - resolution: {integrity: sha512-q4fje/9heG/Mx3m5hEC9fpP1bUcpVtpq1sSZ7pWcVrYVxkMNBEEfcILwmUIo2EtMwbBp0/aPzVBsXcA8mG777A==} + '@vitejs/plugin-rsc@0.5.39': + resolution: {integrity: sha512-hRa6CK119r1NkwgPWlPRiDP8e4rELCsIZwjGmQK0sOnayAkYPBkyJMip0GhYEt2ukBZaO0Uw3ICHHO9T692OFw==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 react-server-dom-webpack: '*' - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: react-server-dom-webpack: optional: true @@ -22881,21 +22675,21 @@ packages: resolution: {integrity: sha512-DSTrmrdLp+0LDNF77fqrKfx7X0ErRbOcUAgJL/HbSesqQwoUvUQ4uYQqaex+rovqgGcoPqVk+AwUh3v9CuiYIw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.0.0 '@vitejs/plugin-vue-jsx@5.1.5': resolution: {integrity: sha512-jIAsvHOEtWpslLOI2MeElGFxH7M8pM83BU/Tor4RLyiwH0FM4nUW3xdvbw20EeU9wc5IspQwMq225K3CMnJEpA==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.0.0 '@vitejs/plugin-vue@6.0.5': resolution: {integrity: sha512-bL3AxKuQySfk1iGcBsQnoRVexTPJq0Z/ixFVM8OhVJAP6ZXXXLtM7NFKWhLl30Kg7uTBqIaPXbh+nuQCuBDedg==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.2.25 '@vitest/expect@4.1.4': @@ -22905,7 +22699,18 @@ packages: resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==} peerDependencies: msw: ^2.4.9 - vite: ^8.0.14 + vite: ^8.3.4 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true + + '@vitest/mocker@5.0.4': + resolution: {integrity: sha512-tqAlrYWce4iUxhr3ncNohejtCTOcHeE8XWrSNZY3OhPoDn01yeGv+gnaBy64ATp7o6pb03eIbBAjzmibpc9vIQ==} + peerDependencies: + msw: ^2.4.9 || ^3.0.0 + vite: ^8.3.4 peerDependenciesMeta: msw: optional: true @@ -22915,6 +22720,9 @@ packages: '@vitest/pretty-format@4.1.4': resolution: {integrity: sha512-ddmDHU0gjEUyEVLxtZa7xamrpIefdEETu3nZjWtHeZX4QxqJ7tRxSteHVXJOcr8jhiLoGAhkK4WJ3WqBpjx42A==} + '@vitest/pretty-format@5.0.4': + resolution: {integrity: sha512-kh/bp0oLr6w18kt4MFn5/zS+Hpc5k3bsf6S2m2Qksj7sKHrnc7Tu90UVYyiXnRvkYruN6kSCHQ3RR+SBE6FinA==} + '@vitest/runner@4.1.4': resolution: {integrity: sha512-xTp7VZ5aXP5ZJrn15UtJUWlx6qXLnGtF6jNxHepdPHpMfz/aVPx+htHtgcAL2mDXJgKhpoo2e9/hVJsIeFbytQ==} @@ -22924,14 +22732,25 @@ packages: '@vitest/spy@4.1.4': resolution: {integrity: sha512-XxNdAsKW7C+FLydqFJLb5KhJtl3PGCMmYwFRfhvIgxJvLSXhhVI1zM8f1qD3Zg7RCjTSzDVyct6sghs9UEgBEQ==} + '@vitest/spy@5.0.4': + resolution: {integrity: sha512-MZKk/gSkm2q+ICobMxCpH1mA+cCAWm8WV7UhxlqGjq/sJ3AGc1BqFOs5CRVXxH78wQtme9q/NAAgBquj4AcyMw==} + '@vitest/ui@4.1.4': resolution: {integrity: sha512-EgFR7nlj5iTDYZYCvavjFokNYwr3c3ry0sFiCg+N7B233Nwp+NNx7eoF/XvMWDCKY71xXAG3kFkt97ZHBJVL8A==} peerDependencies: vitest: 4.1.4 + '@vitest/ui@5.0.4': + resolution: {integrity: sha512-L40ToOGwFgeZ+JVPMKHb7T0b671mqcmCpMUh9P68xq9YZ+TXM72rkDf9ljuv02e5Y1zj8ww0CnWIUnqs3FEWKQ==} + peerDependencies: + vitest: 5.0.4 + '@vitest/utils@4.1.4': resolution: {integrity: sha512-13QMT+eysM5uVGa1rG4kegGYNp6cnQcsTc67ELFbhNLQO+vgsygtYJx2khvdt4gVQqSSpC/KT5FZZxUpP3Oatw==} + '@vitest/utils@5.0.4': + resolution: {integrity: sha512-hgpnyMuMqCz2PARmk3v62FxUr8jHIkY13ygvUeh8s+dmQxfnvkB/sgtoZFzG4lMitnEdnrg/lCvDbtVzuAsGWQ==} + '@volar/language-core@2.4.26': resolution: {integrity: sha512-hH0SMitMxnB43OZpyF1IFPS9bgb2I3bpCh76m2WEK7BE0A0EzpYsRp0CCH2xNKshr7kacU5TQBLYn4zj7CG60A==} @@ -23127,10 +22946,6 @@ packages: resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==} engines: {node: '>=16.0.0'} - '@whatwg-node/server@0.10.13': - resolution: {integrity: sha512-Otmxo+0mp8az3B48pLI1I4msNOXPIoP7TLm6h5wOEQmynqHt8oP9nR6NJUeJk6iI5OtFpQtkbJFwfGkmplvc3Q==} - engines: {node: '>=18.0.0'} - '@whatwg-node/server@0.11.0': resolution: {integrity: sha512-VSdkwnJRr8Yv9UgB2aXB3VUPWwd6Oqnn0hycFwhg9pZgWxJXb7JmhsiXe9tmpMwjHFxli12PGcz9aI63YYloGQ==} engines: {node: '>=18.0.0'} @@ -23149,8 +22964,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -23292,7 +23107,6 @@ packages: ansi-html-community@0.0.8: resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} - engines: {'0': node >= 0.8.0} hasBin: true ansi-regex@5.0.1: @@ -23326,14 +23140,6 @@ packages: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} - archiver-utils@5.0.2: - resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==} - engines: {node: '>= 14'} - - archiver@7.0.1: - resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==} - engines: {node: '>= 14'} - archiver@8.0.0: resolution: {integrity: sha512-fV1orZfsnPn9BaSByR/qE67rJCLJEy2Ox5bq7nJh+jquWaNh6Sfec75kJ2T6PtdGUbPQlrVoSVCEOa5SdiTQ1g==} engines: {node: '>=18'} @@ -23542,8 +23348,8 @@ packages: next: ^14.0.0 || ^15.0.0 || ^16.0.0 pg: ^8.0.0 prisma: ^5.0.0 || ^6.0.0 || ^7.0.0 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 solid-js: 1.9.12 svelte: ^4.0.0 || ^5.0.0 vitest: ^2.0.0 || ^3.0.0 || ^4.0.0 @@ -23603,6 +23409,9 @@ packages: bidi-js@1.0.3: resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==} + big.js@5.2.2: + resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} + binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} @@ -23639,6 +23448,10 @@ packages: brace-expansion@2.1.1: resolution: {integrity: sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==} + brace-expansion@5.0.12: + resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==} + engines: {node: 20 || >=22} + brace-expansion@5.0.9: resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==} engines: {node: 20 || >=22} @@ -23698,13 +23511,9 @@ packages: magicast: optional: true - c12@3.3.4: - resolution: {integrity: sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==} - peerDependencies: - magicast: '*' - peerDependenciesMeta: - magicast: - optional: true + cac@7.1.0: + resolution: {integrity: sha512-LMDU/U2yA4IPIY8KT0NsNPWEYZvAMkbgyspxJ6btJaYV+WMDOHAZCmB0lsTObiHaRS1V/ztKAl7+TSkTqXyeoA==} + engines: {node: '>=20.19.0'} call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} @@ -23734,8 +23543,13 @@ packages: caniuse-lite@1.0.30001760: resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==} - chai@6.2.2: - resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} + cf@1.0.0-beta.28: + resolution: {integrity: sha512-sMt4G50Mvz0+wvp6ScckPmmJSrEtfN3BeYJbtJ9yN5wAgECgFUGy0twoup1KySG9Md4Ow4ifSkllPLBFQV9ePw==} + engines: {node: ^22.23.0 || ^24.22.0 || ^26.12.0} + hasBin: true + + chai@6.3.0: + resolution: {integrity: sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==} engines: {node: '>=18'} chalk@3.0.0: @@ -23848,10 +23662,6 @@ packages: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} - cliui@9.0.1: - resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==} - engines: {node: '>=20'} - clone-deep@4.0.1: resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==} engines: {node: '>=6'} @@ -23898,6 +23708,9 @@ packages: colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} + colorjs.io@0.7.1: + resolution: {integrity: sha512-LY7OHnJZxHwT5UlzNa9bbhHHDbzB6yE5+3MIPwJEQKRvSCt/T4G7epsj+9j2BExUIIfXFIJGsIXUKdfrK9Q5tA==} + combinate@1.1.11: resolution: {integrity: sha512-+2MNAQ29HtNejOxkgaTQPC2Bm+pQvFuqf7o18uObl/Bx3daX06kjLUNY/qa9f+YSqzqm/ic3SdrlfN0fvTlw2g==} @@ -23939,19 +23752,9 @@ packages: resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==} engines: {node: '>=4.0.0'} - commondir@1.0.1: - resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} - compare-versions@6.1.1: resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==} - compatx@0.2.0: - resolution: {integrity: sha512-6gLRNt4ygsi5NyMVhceOCFv14CIdDFN7fQjX1U4+47qVE/+kjPoXMK65KWK+dWxmFzMTuKazoQ9sch6pM0p5oA==} - - compress-commons@6.0.2: - resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==} - engines: {node: '>= 14'} - compress-commons@7.0.1: resolution: {integrity: sha512-g0S8KAD8qf4+V//pr3BfB1aBnARLXNz2Gx+jmHU0LEriUuoQUOPOulVquHKTJ8+EAIIO7fhseNDr9wK5Q9FKBQ==} engines: {node: '>=18'} @@ -23990,12 +23793,6 @@ packages: confbox@0.2.2: resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==} - confbox@0.2.4: - resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==} - - confbox@0.3.1: - resolution: {integrity: sha512-cKUSoKa8YxFZZSmraVi7onONx3amu77ngK3kGpsYHDH7drPwCRkQE1RYMPlLRrMtnciRj274XNRxcHxnKmDSnA==} - config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -24036,7 +23833,7 @@ packages: '@standard-schema/spec': ^1.0.0 convex: ^1.24.0 hono: ^4.0.5 - react: ^19.2.3 + react: ~19.2.9 typescript: ^5.5 zod: ^3.22.4 || ^4.0.15 peerDependenciesMeta: @@ -24064,8 +23861,8 @@ packages: peerDependencies: '@auth0/auth0-react': ^2.0.1 '@clerk/clerk-react': ^4.12.8 || ^5.0.0 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@auth0/auth0-react': optional: true @@ -24083,7 +23880,7 @@ packages: peerDependencies: '@auth0/auth0-react': ^2.0.1 '@clerk/clerk-react': ^4.12.8 || ^5.0.0 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@auth0/auth0-react': optional: true @@ -24095,9 +23892,6 @@ packages: cookie-es@1.2.3: resolution: {integrity: sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==} - cookie-es@2.0.1: - resolution: {integrity: sha512-aVf4A4hI2w70LnF7GG+7xDQUkliwiXWXFvTjkip4+b64ygDQ2sJPRSKFDHbxn8o0xu9QzPkMuuiWIXyFSE2slA==} - cookie-es@3.1.1: resolution: {integrity: sha512-UaXxwISYJPTr9hwQxMFYZ7kNhSXboMXP+Z3TRX6f1/NyaGPfuNUZOWP1pUEb75B2HjfklIYLVRfWiFZJyC6Npg==} @@ -24149,10 +23943,6 @@ packages: engines: {node: '>=0.8'} hasBin: true - crc32-stream@6.0.0: - resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} - engines: {node: '>= 14'} - crc32-stream@7.0.1: resolution: {integrity: sha512-IBWsY8xznyQrcHn8h4bC8/4ErNke5elzgG8GcqF4RFPw6aHkWWRc7Tgw6upjaTX/CT/yQgqYENkxYsTYN+hW2g==} engines: {node: '>=18'} @@ -24161,10 +23951,6 @@ packages: resolution: {integrity: sha512-pKRrRagItwk9rGIStcUyMxFX34x56zoX3KDf9HJ4ttwkXIK1qxK63EvXvEDmlxI9AdPJ+Y7TEKRftRlW5eSS7A==} engines: {node: '>=18'} - croner@10.0.1: - resolution: {integrity: sha512-ixNtAJndqh173VQ4KodSdJEI6nuioBWI0V1ITNKhZZsO0pEMoDxz539T4FTTbSZ/xIOSuDnzxLVRqBVSvPNE2g==} - engines: {node: '>=18.0'} - cross-argv@2.0.0: resolution: {integrity: sha512-YIaY9TR5Nxeb8SMdtrU8asWVM4jqJDNDYlKV21LxtYcfNJhp1kEsgSa6qXwXgzN0WQWGODps0+TlGp2xQSHwOg==} @@ -24188,30 +23974,6 @@ packages: srvx: optional: true - crossws@0.4.3: - resolution: {integrity: sha512-lmf5mtwHiToP3HumOx53cqS0T5TK8GMBpsbSCXRB5OuszbltTgGOO4B1WhrDYqTeXOk3BAemibNjJx8E0/ecNw==} - peerDependencies: - srvx: '>=0.7.1' - peerDependenciesMeta: - srvx: - optional: true - - crossws@0.4.4: - resolution: {integrity: sha512-w6c4OdpRNnudVmcgr7brb/+/HmYjMQvYToO/oTrprTwxRUiom3LYWU1PMWuD006okbUWpII1Ea9/+kwpUfmyRg==} - peerDependencies: - srvx: '>=0.7.1' - peerDependenciesMeta: - srvx: - optional: true - - crossws@0.4.5: - resolution: {integrity: sha512-wUR89x/Rw7/8t+vn0CmGDYM9TD6VtARGb0LD5jq2wjtMy1vCP4M+sm6N6TigWeTYvnA8MoW29NqqXD0ep0rfBA==} - peerDependencies: - srvx: '>=0.11.5' - peerDependenciesMeta: - srvx: - optional: true - css-loader@7.1.2: resolution: {integrity: sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==} engines: {node: '>= 18.12.0'} @@ -24294,28 +24056,8 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} - db0@0.3.4: - resolution: {integrity: sha512-RiXXi4WaNzPTHEOu8UPQKMooIbqOEyqA1t7Z6MsdxSCeb8iUC9ko3LcmsLmeUt2SM5bctfArZKkRQggKZz7JNw==} - peerDependencies: - '@electric-sql/pglite': '*' - '@libsql/client': '*' - better-sqlite3: '*' - drizzle-orm: '*' - mysql2: '*' - sqlite3: '*' - peerDependenciesMeta: - '@electric-sql/pglite': - optional: true - '@libsql/client': - optional: true - better-sqlite3: - optional: true - drizzle-orm: - optional: true - mysql2: - optional: true - sqlite3: - optional: true + db0@0.4.1: + resolution: {integrity: sha512-6RBY/bSn42UrqATwsiULj2uYFyEykB3XeA/NLIVQeHNXlYV6D4Idxx3/aa6k5Y45Dwzx7sygeLotnqHWSeURYA==} de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} @@ -24374,10 +24116,6 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - default-browser-id@5.0.0: - resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==} - engines: {node: '>=18'} - default-browser-id@5.0.1: resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==} engines: {node: '>=18'} @@ -24386,10 +24124,6 @@ packages: resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==} engines: {node: '>=18'} - default-browser@5.5.0: - resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==} - engines: {node: '>=18'} - defaults@1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} @@ -24514,8 +24248,8 @@ packages: dexie@4.2.1: resolution: {integrity: sha512-Ckej0NS6jxQ4Po3OrSQBFddayRhTCic2DoCAG5zacOfOVB9P2Q5Xc5uL/nVa7ZVs+HdMnvUPzLFCB/JwpB6Csg==} - diff@8.0.4: - resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} + diff@9.0.0: + resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==} engines: {node: '>=0.3.1'} dir-glob@3.0.1: @@ -24564,10 +24298,6 @@ packages: dot-case@3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} - dot-prop@10.1.0: - resolution: {integrity: sha512-MVUtAugQMOff5RnBy2d9N31iG0lNwg1qAoAOn7pOK5wf94WIaE3My2p3uwTQuvS2AcqchkcR3bHByjaM0mmi7Q==} - engines: {node: '>=20'} - dot-prop@9.0.0: resolution: {integrity: sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==} engines: {node: '>=18'} @@ -24588,10 +24318,6 @@ packages: resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==} engines: {node: '>=12'} - dotenv@17.4.2: - resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==} - engines: {node: '>=12'} - dotenv@8.6.0: resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} engines: {node: '>=10'} @@ -24600,9 +24326,6 @@ packages: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} - duplexer@0.1.2: - resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} - eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} @@ -24631,9 +24354,6 @@ packages: electron-to-chromium@1.5.90: resolution: {integrity: sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==} - emoji-regex@10.6.0: - resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==} - emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -24643,6 +24363,10 @@ packages: emojilib@2.4.0: resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==} + emojis-list@3.0.0: + resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} + engines: {node: '>= 4'} + empathic@2.0.0: resolution: {integrity: sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==} engines: {node: '>=14'} @@ -24707,14 +24431,9 @@ packages: resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - env-runner@0.1.6: - resolution: {integrity: sha512-fSb7X1zdda8k6611a6/SdSQpDe7a/bqMz2UWdbHjk9YWzpUR4/fn9YtE/hqgGQ2nhvVN0zUtcL1SRMKwIsDbAA==} + env-runner@0.2.3: + resolution: {integrity: sha512-S8EFBKyznRwPVwayK187cYjvnpgC92xy+q0BIF++V965pfjMVVRbQ/HoTYGA/1EHmZ7E68k6Heq+4WnvVhOL5w==} hasBin: true - peerDependencies: - miniflare: ^4.0.0 - peerDependenciesMeta: - miniflare: - optional: true envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} @@ -24748,15 +24467,14 @@ packages: es-module-lexer@1.7.0: resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} - es-module-lexer@2.3.1: - resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==} + es-module-lexer@2.3.2: + resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==} - es-module-lexer@3.0.2: - resolution: {integrity: sha512-BuIB67FngDSyQ/dpQNOZybwdEBDUGJQvOqwWr4ha/ufYiqzuEwPkKO2zLhRAgay28tStRIHUeWmszZAJo3GCOg==} + es-module-lexer@3.0.3: + resolution: {integrity: sha512-yWGe1O/j+almnV4hOYrmZo8u58JdnmXEMneRQAYkWtqSiT86yoMIEKF4rpqEDj52tbYl3xceBD3DQIBwcsC9Pw==} - es-object-atoms@1.1.1: - resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} - engines: {node: '>= 0.4'} + es-module-lexer@3.0.4: + resolution: {integrity: sha512-BldNY5mwkVu+cQ5Ymn3e6hB9Sx8XHx4ZevWbiUyZbfKxJxYO27Hf0wfzkxIaD5CAJMaGl3YspKELj0ff/7nCMA==} es-object-atoms@1.1.2: resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==} @@ -24820,11 +24538,6 @@ packages: engines: {node: '>=18'} hasBin: true - esbuild@0.28.2: - resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==} - engines: {node: '>=18'} - hasBin: true - escalade@3.2.0: resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} engines: {node: '>=6'} @@ -25082,8 +24795,8 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - expect-type@1.3.0: - resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} + expect-type@1.4.0: + resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==} engines: {node: '>=12.0.0'} express@4.22.2: @@ -25097,6 +24810,9 @@ packages: exsolve@1.1.1: resolution: {integrity: sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==} + exsolve@1.2.0: + resolution: {integrity: sha512-h1pQPR9XoeSMdntRNCjyTznaume4UpfXrULBnlkZ2CUM/G5eSa+pBByGldO5uR8dxbPC+OuJXsPPNf+JZ81ADg==} + extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -25177,8 +24893,8 @@ packages: resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} engines: {node: ^12.20 || >= 14.13} - fetchdts@0.1.7: - resolution: {integrity: sha512-YoZjBdafyLIop9lSxXVI33oLD5kN31q4Td+CasofLLYeLXRFeOsuOw0Uo+XNRi9PZlbfdlN2GmRtm4tCEQ9/KA==} + fetchdts@0.2.0: + resolution: {integrity: sha512-PJb4ZTGT2/wK78RmVrxZITStWabhZlKBsL52VOgq+c7clEkdHdEB+0rtzrXCbZJqeYJj+IwNWYqB5/G6vouA6A==} fflate@0.8.3: resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==} @@ -25233,10 +24949,6 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - find-up@6.3.0: - resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - find-up@7.0.0: resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} engines: {node: '>=18'} @@ -25255,6 +24967,9 @@ packages: flatted@3.4.2: resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==} + flatted@3.4.4: + resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==} + fn.name@1.1.0: resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} @@ -25295,8 +25010,8 @@ packages: resolution: {integrity: sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==} peerDependencies: '@emotion/is-prop-valid': '*' - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@emotion/is-prop-valid': optional: true @@ -25350,10 +25065,6 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.6.0: - resolution: {integrity: sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==} - engines: {node: '>=18'} - get-intrinsic@1.3.0: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} engines: {node: '>= 0.4'} @@ -25387,10 +25098,6 @@ packages: resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==} hasBin: true - giget@3.3.1: - resolution: {integrity: sha512-r+mvuDjrjMpsdw46Kmeydb8bdHm7wOKw8wNBtTndkjbPjgAp5oUJUxRE76wZFknxIPokfWvep2qSXK37aXE6zg==} - hasBin: true - gl-matrix@3.4.4: resolution: {integrity: sha512-latSnyDNt/8zYUB6VIJ6PCh2jBjJX6gnDsoCZ7LyW7GkqrD51EWwa9qCoGixj8YqBtETQK/xY7OmpTF8xz1DdQ==} @@ -25438,10 +25145,6 @@ packages: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} - globby@16.2.4: - resolution: {integrity: sha512-c8B/VNLmxRcmqqenRA9t+9IyOjf9+V6lTxPaUJLqOCONdQkWZ0ETYgX0qbtJqPsgCNusT9MZ5Jeidw8Eb9tn2g==} - engines: {node: '>=20'} - globrex@0.1.2: resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} @@ -25476,41 +25179,20 @@ packages: resolution: {integrity: sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - gzip-size@7.0.0: - resolution: {integrity: sha512-O1Ld7Dr+nqPnmGpdhzLmMTQ4vAsD+rHwMm1NLUmoUFFymBOMKxCCrtDxqdBRYXdeEPEi3SyoR4TizJLQrnKBNA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - h3@1.15.11: resolution: {integrity: sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==} - h3@2.0.1-rc.14: - resolution: {integrity: sha512-163qbGmTr/9rqQRNuqMqtgXnOUAkE4KTdauiC9y0E5iG1I65kte9NyfWvZw5RTDMt6eY+DtyoNzrQ9wA2BfvGQ==} + h3@2.0.1-rc.32: + resolution: {integrity: sha512-Epg1E85L8yIKd9UeAQAVdm6QVrnHbppMsQ641EjpNi4c0IlAg+PJlwp4Xw03Z1loRXPQaH9k64gJT5qDELqm+g==} engines: {node: '>=20.11.1'} hasBin: true peerDependencies: - crossws: ^0.4.1 + crossws: ^0.4.12 + ocache: '>=0.3.0' peerDependenciesMeta: crossws: optional: true - - h3@2.0.1-rc.16: - resolution: {integrity: sha512-h+pjvyujdo9way8qj6FUbhaQcHlR8FEq65EhTX9ViT5pK8aLj68uFl4hBkF+hsTJAH+H1END2Yv6hTIsabGfag==} - engines: {node: '>=20.11.1'} - hasBin: true - peerDependencies: - crossws: ^0.4.1 - peerDependenciesMeta: - crossws: - optional: true - - h3@2.0.1-rc.20: - resolution: {integrity: sha512-28ljodXuUp0fZovdiSRq4G9OgrxCztrJe5VdYzXAB7ueRvI7pIUqLU14Xi3XqdYJ/khXjfpUOOD2EQa6CmBgsg==} - engines: {node: '>=20.11.1'} - hasBin: true - peerDependencies: - crossws: ^0.4.1 - peerDependenciesMeta: - crossws: + ocache: optional: true handle-thing@2.0.1: @@ -25576,15 +25258,21 @@ packages: hoist-non-react-statics@3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} + hono-sessions@0.8.1: + resolution: {integrity: sha512-YLSKuIP13yhXTQe2x3sCc1JWsqt1Z3WZB2DWE+oX+YpOsC3lv8uCHnCoNHcY9DPyflDw4XQJN+MFVvcp5QwWdw==} + peerDependencies: + hono: ^4.0.0 + + hono@4.13.9: + resolution: {integrity: sha512-7dMkQmZoC4E6F7AtaQSPhlWAdnBti+j7rreMZl8QB4jFiEhP9TWbGWUMi8WYzBCgmgulxuvLQupKqo+Co6Omyg==} + engines: {node: '>=16.9.0'} + hono@4.7.10: resolution: {integrity: sha512-QkACju9MiN59CKSY5JsGZCYmPZkA6sIW6OFCUp7qDjZu6S6KHtJHhAc9Uy9mV9F8PJ1/HQ3ybZF2yjCa/73fvQ==} engines: {node: '>=16.9.0'} - hookable@5.5.3: - resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} - - hookable@6.1.0: - resolution: {integrity: sha512-ZoKZSJgu8voGK2geJS+6YtYjvIzu9AOM/KZXsBxr83uhLL++e9pEv/dlgwgy3dvHg06kTz6JOh1hk3C8Ceiymw==} + hookable@6.1.2: + resolution: {integrity: sha512-+abwxtiEA52GCVIsQqut3S/uKTbUwYIp4Pe/vv+6py5XiXBCqMZHg6pA6Y5qhgLSEys0/cYuPbO0z1QFj5ZCmg==} hosted-git-info@7.0.2: resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} @@ -25692,9 +25380,6 @@ packages: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} - httpxy@0.3.1: - resolution: {integrity: sha512-XjG/CEoofEisMrnFr0D6U6xOZ4mRfnwcYQ9qvvnT4lvnX8BoeA3x3WofB75D+vZwpaobFVkBIHrZzoK40w8XSw==} - httpxy@0.5.5: resolution: {integrity: sha512-uDjmnPyp1q4Sgzf3w+J/Fc6UqcCEj0x4Wjp7OqK5dGhNeDgpyrAmnS6ey8QWrX3SWDon2DMKf9sBa5X9+CVyMA==} @@ -25741,6 +25426,10 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} + ignore@7.0.12: + resolution: {integrity: sha512-/8UvqAPU9DGTI9k4mxtf49U37Isfwr8Uts96+SBHIkFxPJnHS0Ew4f00sM4Scd8V8EjM0jUNtVDdv1kPdt35lg==} + engines: {node: '>= 4'} + ignore@7.0.5: resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} engines: {node: '>= 4'} @@ -25748,17 +25437,15 @@ packages: image-meta@0.2.2: resolution: {integrity: sha512-3MOLanc3sb3LNGWQl1RlQlNWURE5g32aUphrDyFeCsxBTk08iE3VNe4CwsUZ0Qs1X+EfX0+r29Sxdpza4B+yRA==} - image-size@2.0.2: - resolution: {integrity: sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==} - engines: {node: '>=16.x'} - hasBin: true - immer@10.1.1: resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==} immutable@5.1.4: resolution: {integrity: sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==} + immutable@5.1.9: + resolution: {integrity: sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==} + import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -25900,10 +25587,6 @@ packages: eslint: ^9.22.0 typescript: '>=4.7.4' - is-in-ssh@1.0.0: - resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==} - engines: {node: '>=20'} - is-inside-container@1.0.0: resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} engines: {node: '>=14.16'} @@ -25917,9 +25600,6 @@ packages: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} - is-module@1.0.0: - resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} - is-network-error@1.1.0: resolution: {integrity: sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==} engines: {node: '>=16'} @@ -25968,9 +25648,6 @@ packages: is-property@1.0.2: resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==} - is-reference@1.2.1: - resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} - is-regex@1.2.1: resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==} engines: {node: '>= 0.4'} @@ -26042,10 +25719,6 @@ packages: resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} engines: {node: '>=16'} - is-wsl@3.1.1: - resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==} - engines: {node: '>=16'} - isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -26087,9 +25760,6 @@ packages: jose@6.1.3: resolution: {integrity: sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==} - jpeg-js@0.4.4: - resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==} - js-base64@3.7.8: resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==} @@ -26102,9 +25772,6 @@ packages: resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} engines: {node: '>=14'} - js-image-generator@1.0.4: - resolution: {integrity: sha512-ckb7kyVojGAnArouVR+5lBIuwU1fcrn7E/YYSd0FK7oIngAkMmRvHASLro9Zt5SQdWToaI66NybG+OGxPw/HlQ==} - js-sha256@0.11.1: resolution: {integrity: sha512-o6WSo/LUvY2uC4j7mO50a2ms7E/EAdbP0swigLV+nzHKTTaYnaLIWJ02VdXrsJX0vGedDESQnLsOekr94ryfjg==} @@ -26114,9 +25781,6 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@9.0.1: - resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} - js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -26229,13 +25893,6 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} - klona@2.0.6: - resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} - engines: {node: '>= 8'} - - knitwork@1.3.0: - resolution: {integrity: sha512-4LqMNoONzR43B1W0ek0fhXMsDNW/zxa1NdFAVMY+k28pgZLovR4G3PB5MrpTxCy1QaZCqNoiaKPr5w5qZHfSNw==} - known-css-properties@0.30.0: resolution: {integrity: sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==} @@ -26462,14 +26119,14 @@ packages: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} + loader-utils@2.0.4: + resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} + engines: {node: '>=8.9.0'} + local-pkg@0.5.1: resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==} engines: {node: '>=14'} - local-pkg@1.2.1: - resolution: {integrity: sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==} - engines: {node: '>=14'} - locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -26579,11 +26236,11 @@ packages: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} - magic-string@1.2.3: - resolution: {integrity: sha512-Bpb0W2TbLKOZ7vJnOUnVRGq3WL2p+ISV29M6hYPL1AFCpyKZpdr5ytiXoTSSxRVhg8YW7f65+6gbG8WG6PCa/g==} + magic-string@1.4.3: + resolution: {integrity: sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==} - magicast@0.5.4: - resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==} + magic-string@1.4.5: + resolution: {integrity: sha512-oLLC2+YvQUfAa+vxoufE/yc1icb87M9iXIRqAoR/2EhE/8cb3SF/+Gi0c2By1B+5Vz2e2vQtUvHiu1+63Znh+w==} manage-path@2.0.0: resolution: {integrity: sha512-NJhyB+PJYTpxhxZJ3lecIGgh4kwIY2RAh44XvAz9UlqthlQwtPBf62uBVR8XaD8CRuSjQ6TnZH2lNJkbLPZM2A==} @@ -26688,11 +26345,6 @@ packages: engines: {node: '>=4'} hasBin: true - mime@4.1.0: - resolution: {integrity: sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==} - engines: {node: '>=16'} - hasBin: true - mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} @@ -26710,6 +26362,10 @@ packages: engines: {node: '>=18.0.0'} hasBin: true + miniflare@5.20261104.0-beta: + resolution: {integrity: sha512-pYZ2n85+FYUb7s0oIVcQxO63/+wgaknm+A/kQjctJqshvHPJs3UtnzaIZ7xrrHMOk8atD7yAfauf6G9VAv7Upg==} + engines: {node: '>=22.0.0'} + minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} @@ -26723,10 +26379,6 @@ packages: minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - minimatch@5.1.9: - resolution: {integrity: sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==} - engines: {node: '>=10'} - minimatch@9.0.1: resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==} engines: {node: '>=16 || 14 >=14.17'} @@ -26813,9 +26465,6 @@ packages: mlly@1.8.0: resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} - mlly@1.8.2: - resolution: {integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==} - module-definition@6.0.1: resolution: {integrity: sha512-FeVc50FTfVVQnolk/WQT8MX+2WVcDnTGiq6Wo+/+lJ2ET1bRVi3HG3YlJUfqagNMc/kUlFSoR96AJkxGpKz13g==} engines: {node: '>=18'} @@ -26895,13 +26544,13 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.12: - resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} + nanoid@3.3.18: + resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.18: - resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} + nanoid@3.3.19: + resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -26943,8 +26592,8 @@ packages: '@opentelemetry/api': ^1.1.0 '@playwright/test': ^1.63.0 babel-plugin-react-compiler: '*' - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 sass: ^1.3.0 peerDependenciesMeta: '@opentelemetry/api': @@ -26956,68 +26605,13 @@ packages: sass: optional: true - nf3@0.3.11: - resolution: {integrity: sha512-ObKp/SA3f1g1f/OMeDlRWaZmqGgk7A0NnDIbeO7c/MV4r/quMlpP/BsqMGuTi3lUlXbC1On8YH7ICM2u2bIAOw==} + nf3@0.3.24: + resolution: {integrity: sha512-HxLK4bo+5jNsEETZp4w3tJblHOA9MCBY14IN9nZJJV8JDxt9yNIYxuBuLMjTAR5GFa3HL61+8VQDUrXv3/C8fw==} - nf3@0.3.6: - resolution: {integrity: sha512-/XRUUILTAyuy1XunyVQuqGp8aEmZ2TfRTn8Rji+FA4xqv20qzL4jV7Reqbuey2XucKgPeRVcEYGScmJM0UnB6Q==} - - nitro@3.0.1-alpha.2: - resolution: {integrity: sha512-YviDY5J/trS821qQ1fpJtpXWIdPYiOizC/meHavlm1Hfuhx//H+Egd1+4C5SegJRgtWMnRPW9n//6Woaw81cTQ==} + nitro@3.0.260903-beta: + resolution: {integrity: sha512-54gANPi62O8rfMvepiJUVuIzEIinYfpeHbebywlLxvVTgIYXDwSvpaU9Id+0sJOBjBx0wC1/CVYXJkH7SY+l0g==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true - peerDependencies: - rolldown: '>=1.0.0-beta.0' - rollup: ^4 - vite: ^8.0.14 - xml2js: ^0.6.2 - peerDependenciesMeta: - rolldown: - optional: true - rollup: - optional: true - vite: - optional: true - xml2js: - optional: true - - nitro@3.0.260311-beta: - resolution: {integrity: sha512-0o0fJ9LUh4WKUqJNX012jyieUOtMCnadkNDWr0mHzdraoHpJP/1CGNefjRyZyMXSpoJfwoWdNEZu2iGf35TUvQ==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - dotenv: '*' - giget: '*' - jiti: ^2.6.1 - rollup: ^4.59.0 - vite: ^8.0.14 - xml2js: ^0.6.2 - zephyr-agent: ^0.1.15 - peerDependenciesMeta: - dotenv: - optional: true - giget: - optional: true - jiti: - optional: true - rollup: - optional: true - vite: - optional: true - xml2js: - optional: true - zephyr-agent: - optional: true - - nitropack@2.13.4: - resolution: {integrity: sha512-tX7bT6zxNeMwkc6hxHiZeUoTOjVrcjoh1Z3cmxOlodIqjl4HISgqfGOmkWSayky3Nv9Z5+KQH52F8nmXJY5AAA==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - xml2js: ^0.6.2 - peerDependenciesMeta: - xml2js: - optional: true no-case@3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} @@ -27123,8 +26717,8 @@ packages: nwsapi@2.2.16: resolution: {integrity: sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==} - nx@23.2.0: - resolution: {integrity: sha512-EWscwgKDr40bpsy2Dpijx0+wdkQjF8Z5Gvo91qLh3Ot2qkoYCznAzrqT2hXkkc1USC1TvX64t5IgsQq0Wtg1nA==} + nx@24.0.0: + resolution: {integrity: sha512-LchM3SyEUYL6qjHUneiSuyYlUscv8t6qpAYWUqnUY5OoSQSLIOLT/xrerLCKUTTcu7Yq1o/TDo9TiwhaBLvM4Q==} hasBin: true peerDependencies: '@swc-node/register': ^1.11.1 @@ -27169,15 +26763,16 @@ packages: obug@2.1.1: resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} - ocache@0.1.2: - resolution: {integrity: sha512-lI34wjM7cahEdrq2I5obbF7MEdE97vULf6vNj6ZCzwEadzyXO1w7QOl2qzzG4IL8cyO7wDtXPj9CqW/aG3mn7g==} + obug@3.0.0: + resolution: {integrity: sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==} + engines: {node: '>=12.20.0'} + + ocache@0.3.0: + resolution: {integrity: sha512-RS/9P0zeBb0gDJmadGERLH8lZNXK7xbufTDhclkXGvFGTsj0G4M5/cLk+mizcERH29mLXNnocfB5wjcK70wGJg==} ofetch@1.5.1: resolution: {integrity: sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA==} - ofetch@2.0.0-alpha.3: - resolution: {integrity: sha512-zpYTCs2byOuft65vI3z43Dd6iSdFbOZZLb9/d21aCpx2rGastVU9dOCv0lu4ykc1Ur1anAYjDi3SUvR0vq50JA==} - ohash@2.0.11: resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} @@ -27219,10 +26814,6 @@ packages: resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==} engines: {node: '>=18'} - open@11.0.0: - resolution: {integrity: sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==} - engines: {node: '>=20'} - optionator@0.9.4: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} @@ -27237,17 +26828,9 @@ packages: outvariant@1.4.3: resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} - oxc-minify@0.110.0: - resolution: {integrity: sha512-KWGTzPo83QmGrXC4ml83PM9HDwUPtZFfasiclUvTV4i3/0j7xRRqINVkrL77CbQnoWura3CMxkRofjQKVDuhBw==} - engines: {node: ^20.19.0 || >=22.12.0} - oxc-resolver@11.19.1: resolution: {integrity: sha512-qE/CIg/spwrTBFt5aKmwe3ifeDdLfA2NESN30E42X/lII5ClF8V7Wt6WIJhcGZjp0/Q+nQ+9vgxGk//xZNX2hg==} - oxc-transform@0.110.0: - resolution: {integrity: sha512-/fymQNzzUoKZweH0nC5yvbI2eR0yWYusT9TEKDYVgOgYrf9Qmdez9lUFyvxKR9ycx+PTHi/reIOzqf3wkShQsw==} - engines: {node: ^20.19.0 || >=22.12.0} - p-event@6.0.1: resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==} engines: {node: '>=16.17'} @@ -27419,9 +27002,6 @@ packages: perfect-debounce@1.0.0: resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} - perfect-debounce@2.1.0: - resolution: {integrity: sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==} - pg-gateway@0.3.0-beta.4: resolution: {integrity: sha512-CTjsM7Z+0Nx2/dyZ6r8zRsc3f9FScoD5UAOlfUx1Fdv/JOIWvRbF7gou6l6vP+uypXQVoYPgw8xZDXgMGvBa4Q==} @@ -27436,10 +27016,6 @@ packages: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} - picomatch@4.0.4: - resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==} - engines: {node: '>=12'} - picomatch@4.0.7: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} @@ -27475,9 +27051,6 @@ packages: pkg-types@2.3.0: resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==} - pkg-types@2.3.3: - resolution: {integrity: sha512-j/lCFdcppV0JxWpCEITdbDltBxPP6cHT+yNJ6Go2OgoSA9518X847X9z0p6LtA4Nc16+eQzCZjRrWanTGvHJ5w==} - pkijs@3.4.0: resolution: {integrity: sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==} engines: {node: '>=16.0.0'} @@ -27550,14 +27123,14 @@ packages: peerDependencies: postcss: ^8.2.9 - postcss@8.5.15: - resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} - engines: {node: ^10 || ^12 || >=14} - postcss@8.5.23: resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==} engines: {node: ^10 || ^12 || >=14} + postcss@8.5.29: + resolution: {integrity: sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==} + engines: {node: ^10 || ^12 || >=14} + postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} @@ -27574,10 +27147,6 @@ packages: resolution: {integrity: sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==} engines: {node: '>=12'} - powershell-utils@0.1.0: - resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==} - engines: {node: '>=20'} - pprof-format@2.2.1: resolution: {integrity: sha512-p4tVN7iK19ccDqQv8heyobzUmbHyds4N2FI6aBMcXz6y99MglTWDxIyhFkNaLeEXs6IFUEzT0zya0icbSLLY0g==} @@ -27637,10 +27206,6 @@ packages: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} engines: {node: '>=6'} - pretty-bytes@7.1.0: - resolution: {integrity: sha512-nODzvTiYVRGRqAOvE84Vk5JDPyyxsVk0/fbA/bq7RqlnhksGpset09XTxbpvLTIjoaF7K8Z8DG8yHtKGTPSYRw==} - engines: {node: '>=20'} - pretty-error@4.0.0: resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==} @@ -27759,8 +27324,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -27788,20 +27353,17 @@ packages: rc9@2.1.2: resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==} - rc9@3.1.0: - resolution: {integrity: sha512-ufjkNVzbRHKcCOmTahZkmVsyc3W+MSk3jY03m+a7tGHkIsdVMG9l10/3HvFbWkkKzY5VFp3pkRsIo/UYgmFL7Q==} - - react-dom@19.2.3: - resolution: {integrity: sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==} + react-dom@19.2.9: + resolution: {integrity: sha512-YceU74W21fXEHszKBLj16MY0CmvpFKOs60iVrIyW/cCgOPsZJNaB6GVJEtIUqt6AG6EjzKLui5lPRrxAeS328Q==} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 react-hot-toast@2.5.1: resolution: {integrity: sha512-54Gq1ZD1JbmAb4psp9bvFHjS7lje+8ubboUmvKZkCsQBLH6AOpZ9JemfRvIdHcfb9AZXRaFLrb3qUobGYDJhFQ==} engines: {node: '>=10'} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -27816,10 +27378,6 @@ packages: resolution: {integrity: sha512-bYXfxuIVt49+VrmqxUNxjDSbFCUmG85IxH2yc7h5sddlUrVvosOTgOphMvWtBSz39VYZByTBRAE6uKAsHoz0gg==} hasBin: true - react-refresh@0.17.0: - resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} - engines: {node: '>=0.10.0'} - react-refresh@0.18.0: resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==} engines: {node: '>=0.10.0'} @@ -27829,7 +27387,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -27839,25 +27397,25 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true - react-server-dom-rspack@0.0.2: - resolution: {integrity: sha512-PowIm+Z65LkvC3yk4t3YrH2nMejwL361jiBT0BMW2bQCDUaNQknDHMPH0aTgMtJ9ZZ1Gc7KFgBvwB0itSzzELQ==} + react-server-dom-rspack@0.1.1: + resolution: {integrity: sha512-pgL4M/D3jFzn/2Dv8ppgFPrauyJjP29sFCV5EjSCLI29+NHIhumkhxnkiK8x0h5SQLPqUVVZfiAu3dn7Bl1RNg==} engines: {node: '>=0.10.0'} peerDependencies: - '@rspack/core': ^2.0.0-0 - react: ^19.2.3 - react-dom: ^19.2.3 + '@rspack/core': ^2.2.0-0 + react: ~19.2.9 + react-dom: ~19.2.9 react-style-singleton@2.2.3: resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==} engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -27865,17 +27423,17 @@ packages: react-transition-group@4.4.5: resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 react-tweet@3.3.0: resolution: {integrity: sha512-gSIG2169ZK7UH6rBzuU+j1xnQbH3IlOTLEkuGrRiJJTMgETik+h+26yHyyVKrLkzwrOaYPk4K3OtEKycqKgNLw==} peerDependencies: - react: ^19.2.3 - react-dom: ^19.2.3 + react: ~19.2.9 + react-dom: ~19.2.9 - react@19.2.3: - resolution: {integrity: sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==} + react@19.2.9: + resolution: {integrity: sha512-RuLdAokXv3sRmZa2/N8QH0KmTBIgDKC+buRUikGqow31+mGSGidLCX2o4XFq8OV+xBFWfhM9DVgTq1PPHADH4w==} engines: {node: '>=0.10.0'} read-package-up@11.0.0: @@ -27909,9 +27467,6 @@ packages: resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - readdir-glob@1.1.3: - resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==} - readdir-glob@3.0.0: resolution: {integrity: sha512-AhNB2KgKeVJr16nK9LLZbJNWnYoT23ZrumNKFDebHBdkC8KHSqWo871JAUhoWC/RtjEVdqNMFpM6qrwRbaUqpw==} engines: {node: '>=18'} @@ -27954,6 +27509,9 @@ packages: reduce-configs@1.1.1: resolution: {integrity: sha512-EYtsVGAQarE8daT54cnaY1PIknF2VB78ug6Zre2rs36EsJfC40EG6hmTU2A2P1ZuXnKAt2KI0fzOGHcX7wzdPw==} + reduce-configs@2.0.1: + resolution: {integrity: sha512-H9KTCWTEb1YM1OoOz0f6TeGZYlW82sIT1viNg3W8CjjY0pD3WI4MHs8GifKt5FKTVIfHh/DenfJqqY+FP9jF2A==} + reflect-metadata@0.2.2: resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} @@ -28077,29 +27635,11 @@ packages: engines: {node: 20 || >=22} hasBin: true - rolldown@1.0.0-rc.9: - resolution: {integrity: sha512-9EbgWge7ZH+yqb4d2EnELAntgPTWbfL8ajiTW+SyhJEC4qhBbkCKbqFV4Ge4zmu5ziQuVbWxb/XwLZ+RIO7E8Q==} + rolldown@1.2.13: + resolution: {integrity: sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true - rolldown@1.0.2: - resolution: {integrity: sha512-oZx5zVDtVB44AW3eaifgDml1gWRDZGvjcfdxonE4swNPG98PrrXjaO/KrnUjzlMnztCCRVlUueA1kCXhARGk6g==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - - rollup-plugin-visualizer@7.1.1: - resolution: {integrity: sha512-ThaGiHTU8XW02OkK80TrTHATraJmM9OAduU4otal+7gyXLpYEtmGBLfx5kW+EHvvLwn03YGW2NnwKUIqsYlJAA==} - engines: {node: '>=22'} - hasBin: true - peerDependencies: - rolldown: 1.x || ^1.0.0-beta || ^1.0.0-rc - rollup: 2.x || 3.x || 4.x - peerDependenciesMeta: - rolldown: - optional: true - rollup: - optional: true - rollup@4.63.1: resolution: {integrity: sha512-3Df9jsstwhccuEfmAMi9l8XUh/GOkVObmFTU7CCVBysEbcOZLl84jCtaAZMcPiMz2EGKsATzQcU+Xr3n/wU6cg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -28108,8 +27648,8 @@ packages: rou3@0.7.12: resolution: {integrity: sha512-iFE4hLDuloSWcD7mjdCDhx2bKcIsYbtOTpfH5MHHLSKMOUyjqQXTeZVa289uuwEGEKFoE/BAPbhaU4B774nceg==} - rou3@0.8.1: - resolution: {integrity: sha512-ePa+XGk00/3HuCqrEnK3LxJW7I0SdNg6EFzKUJG73hMAdDcOUC/i/aSz7LSDwLrGr33kal/rqOGydzwl6U7zBA==} + rou3@0.9.2: + resolution: {integrity: sha512-3SOzvaAg8rkHrXtRjpCvCvbyO5to9oOO27Z/XqHEYXfMRVSw/qMIVdmaOk9W2lcRLtR6dlqTjo9hDeJk70QBYQ==} router@2.2.0: resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==} @@ -28121,6 +27661,11 @@ packages: rrweb-cssom@0.8.0: resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==} + rsbuild-plugin-cloudflare@0.0.4: + resolution: {integrity: sha512-YIKJGwcvMJNMo922/kNCdK/P7tk+D861SG41sMl1Y/M/BnlzX3b0UMoJZcPeEV1sfDrDBLYCPaqsBPEYC5Ya1g==} + peerDependencies: + '@rsbuild/core': ^2.2.10 + rspack-vue-loader@17.5.0: resolution: {integrity: sha512-hJrL2+jytfTs6ORHBOKTh5lU7BVZvmv7afELuQfyEpGC1ll7MKj1BxlgAIbhd6pZwoEwfdH79Lewtwe4VOlfCQ==} peerDependencies: @@ -28135,10 +27680,6 @@ packages: vue: optional: true - run-applescript@7.0.0: - resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==} - engines: {node: '>=18'} - run-applescript@7.1.0: resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==} engines: {node: '>=18'} @@ -28176,6 +27717,128 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + sass-embedded-all-unknown@1.105.1: + resolution: {integrity: sha512-kN0G03K9KoUbSf72t7ZvxAudcB4Wbf0M0XFaPc1gaF94jEPUb0xLCQUIPIDPH2Kx8vpYZ/GzzgF7USsB6rUYfw==} + cpu: ['!arm', '!arm64', '!riscv64', '!x64'] + + sass-embedded-android-arm64@1.105.1: + resolution: {integrity: sha512-lWnIFmW3gL4ZDfZgjeUfxazmA0zlwSS/ADe2q9XmP0W2UfM9kuvrXdWvp6KjZOCv0CrTYVQMrIUj8Of1L2M24Q==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [android] + + sass-embedded-android-arm@1.105.1: + resolution: {integrity: sha512-WYltUXkUP9jDaUq4uUiLgZXyYO5c72sa/TvpO4E2MMRdS+WJWgrPUDyvO+DpMR9gKWIm0QQ5cCEYnPDgovjVJw==} + engines: {node: '>=14.0.0'} + cpu: [arm] + os: [android] + + sass-embedded-android-riscv64@1.105.1: + resolution: {integrity: sha512-lWity0qhyQyPgkHUfZz+4IeD0r6mcAqG9KzOwVSjUrcSR9xAfWFKYAtHTA05R28ymyXf2Sf2+XfNV7YkxLgkUQ==} + engines: {node: '>=14.0.0'} + cpu: [riscv64] + os: [android] + + sass-embedded-android-x64@1.105.1: + resolution: {integrity: sha512-FRGZuIZ9eS3qutYPFqz8u12Ti9ccyWKWb7F7rKRI1BkIEmLZV1rC862dUGnTV2d9Tk9qbSAXL71t8alUR+fzIA==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [android] + + sass-embedded-darwin-arm64@1.105.1: + resolution: {integrity: sha512-75qVpHj0qwJKWOo+ZA5NPVFnOGfRrUiBdnLR0dPqsvzp3acvb5gBevptqTtJjVWubpYRIjcRdDDjmeWoXnfacQ==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [darwin] + + sass-embedded-darwin-x64@1.105.1: + resolution: {integrity: sha512-5TV8xyZrOO89ky752favkTuyz9O2hOB2aMoiUpMTk0rFr+UVANcXdIrEvJ9WKoqTHaszim7un3jADumunpW7zQ==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [darwin] + + sass-embedded-linux-arm64@1.105.1: + resolution: {integrity: sha512-arALlVQkXjxN1RPaQR41vbDYXrTIdXwPtEzBWRkOg7FdIN/dSohY8ik96M6M3MSc+niV/UIC7BO47PcspzJGpw==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + libc: glibc + + sass-embedded-linux-arm@1.105.1: + resolution: {integrity: sha512-Ng9GWIF6heTrwc9r/FFY9oUSoaylV2zcS296Qo2re3tJfLMWR37O2JUMyzPT+vtkRs8k3JOE6jTFVlXYnz4EAA==} + engines: {node: '>=14.0.0'} + cpu: [arm] + os: [linux] + libc: glibc + + sass-embedded-linux-musl-arm64@1.105.1: + resolution: {integrity: sha512-KizYVR3d70U67iLgKdF+HCKBdQYUxYiv0YWCS3zl6GwNGIbGXlkOtnjxus41CKTA4oOK0KsSus9P5zwhOBjiYA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + libc: musl + + sass-embedded-linux-musl-arm@1.105.1: + resolution: {integrity: sha512-7u932XawHxGZvuYV4pOqcCvQi05yMONDmNDxVNh8Q7KmpytQP7mnyxBOYWStiw/p665AVL6BYGe7WY/vzCcWGw==} + engines: {node: '>=14.0.0'} + cpu: [arm] + os: [linux] + libc: musl + + sass-embedded-linux-musl-riscv64@1.105.1: + resolution: {integrity: sha512-gs84BgRBVNMX5fHRU3wxc3HuJjl0dUmZFpcVIaDDEVhnp5oXFLQp+gEu0xBBAurTzCHVpPU6GlGK6B1gRKmbhg==} + engines: {node: '>=14.0.0'} + cpu: [riscv64] + os: [linux] + libc: musl + + sass-embedded-linux-musl-x64@1.105.1: + resolution: {integrity: sha512-jFSRc1BSoCo0bw6GXmBWQMzdj0FBl2FTKSRqQSye3vmlI9O466DwBK4OQL9HRp6MGdY9IQFFMZLPZo5LJWIPsQ==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + libc: musl + + sass-embedded-linux-riscv64@1.105.1: + resolution: {integrity: sha512-tkZs6OvA+omJgSf8EaPQavq6M7bJNLm88eKt3yzYnBy0dVGMao4+lyRb/EnsgIq2R/B2lhxUHhSVNWAcY5bgXw==} + engines: {node: '>=14.0.0'} + cpu: [riscv64] + os: [linux] + libc: glibc + + sass-embedded-linux-x64@1.105.1: + resolution: {integrity: sha512-YF4OyymSlm26OcdPovIZL1blzjTxf5yN/rzgTmoGqAjEk57+yIuYo+7jBCgSQZFov8Rn4uHhZT+u0cpzxNFMRg==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + libc: glibc + + sass-embedded-unknown-all@1.105.1: + resolution: {integrity: sha512-bd2zDf+MdoPdRDH1awSQ+IL67vHvCbiKsWJ95XchPg3I67zQlXjTSf9KqRiE6twjNT1fRV82JUKoc0Hf6CUmfQ==} + os: ['!android', '!darwin', '!linux', '!win32'] + + sass-embedded-win32-arm64@1.105.1: + resolution: {integrity: sha512-Zpp/RWYL8ZzpLzBrs+/UVMEHOHx7sw4nlq2R52dKQ0qv/0V8oKemAy41PZyLir3c+S2C+YViYyfnFfQLRTAzuA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [win32] + + sass-embedded-win32-x64@1.105.1: + resolution: {integrity: sha512-DM8EkMDzEsxnYoy11nyA5I4jr8lOV1TVQ/drNYvFQA9undiMzZD+7SkRA0OnCrgD1uCT+uRArCHSpNiiYVks+g==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [win32] + + sass-embedded@1.105.1: + resolution: {integrity: sha512-9tKxXG4rq+oGTZUlQehWZwHxBTL80EiB8IWk9AEqz8uOqg910t88JIYbN92eMCxokQ5vrYSQxg15bh0o/3hh3w==} + engines: {node: '>=20.19.0'} + hasBin: true + + sass@1.105.1: + resolution: {integrity: sha512-1CnAWPyrrnVQzXGB/DUep1vYCKCm1CIBr+YxjjiW6wk9qtzemnGP4qicH56T2F9S4Hjtv/Ne3jDz8JqfdDU4oA==} + engines: {node: '>=20.19.0'} + hasBin: true + sass@1.97.2: resolution: {integrity: sha512-y5LWb0IlbO4e97Zr7c3mlpabcbBtS+ieiZ9iwDooShpFKWXf62zz5pEPdwrLYm+Bxn1fnbwFGzHuCLSA9tBmrw==} engines: {node: '>=14.0.0'} @@ -28199,9 +27862,6 @@ packages: resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==} engines: {node: '>= 10.13.0'} - scule@1.3.0: - resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==} - secure-json-parse@4.1.0: resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==} @@ -28236,11 +27896,6 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.8.4: - resolution: {integrity: sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==} - engines: {node: '>=10'} - hasBin: true - semver@7.8.5: resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} engines: {node: '>=10'} @@ -28260,10 +27915,6 @@ packages: serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - serialize-javascript@7.1.1: - resolution: {integrity: sha512-k3CMsaIvvdSwm8oLB4MXSl0wH2/cwlH7xGcnRd2DaeRmBkbzYmyT8j0tsX60DwD1eRwHTpNpH8ljKu9oUT1MeQ==} - engines: {node: '>=20.0.0'} - seroval-plugins@1.5.4: resolution: {integrity: sha512-S0xQPhUTefAhNvNWFg0c1J8qJArHt5KdtJ/cFAofo06KD1MVSeFWyl4iiu+ApDIuw0WhjpOfCdgConOfAnLgkw==} engines: {node: '>=10'} @@ -28288,9 +27939,6 @@ packages: resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} engines: {node: '>= 0.8.0'} - serve-placeholder@2.0.2: - resolution: {integrity: sha512-/TMG8SboeiQbZJWRlfTCqMs2DD3SZgWp0kDQePz9yUuCnDfDh/92gf7/PxGhzXTKBIPASIHxFcZndoNbp6QOLQ==} - serve-static@1.16.2: resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} engines: {node: '>= 0.8.0'} @@ -28336,6 +27984,15 @@ packages: '@types/node': optional: true + sharp@0.35.5: + resolution: {integrity: sha512-Ywn4OnzGukp7CDMrp08RQ50YKmuwG47brZgIVPTvBaaAfQlRlygrRqSrxdCiL9M+LlzLBiJ68IR1QqvzHyjC7g==} + engines: {node: '>=20.9.0'} + peerDependencies: + '@types/node': '*' + peerDependenciesMeta: + '@types/node': + optional: true + shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -28397,20 +28054,17 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - slash@5.1.0: - resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==} - engines: {node: '>=14.16'} - slashes@3.0.12: resolution: {integrity: sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==} - smob@1.5.0: - resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==} - smol-toml@1.6.1: resolution: {integrity: sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==} engines: {node: '>= 18'} + smol-toml@1.9.0: + resolution: {integrity: sha512-hpd+HLON7HdZXqYchMM/+LaTTbdK0AU3NngIJ4KVyWbY9bfQqdL9cD+4yf6dUoU2Ap4VsU0JkQi6FxAI1B2mXQ==} + engines: {node: '>= 18'} + sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} @@ -28439,6 +28093,10 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} + source-map-js@1.2.2: + resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} + engines: {node: '>=0.10.0'} + source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} @@ -28454,10 +28112,6 @@ packages: resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} engines: {node: '>= 12'} - source-map@0.8.0: - resolution: {integrity: sha512-d8EqvL+k/SOXCreS/SUzg2ciyHqBBLcN/yuRjFsbvVhHTE2pgei7oAhmPM7kWFbkX6OSMQfUq4KbkF3au9lhYQ==} - engines: {node: '>= 12'} - spawn-command@0.0.2: resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} @@ -28499,33 +28153,13 @@ packages: resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==} engines: {node: '>= 0.6'} - srvx@0.10.0: - resolution: {integrity: sha512-NqIsR+wQCfkvvwczBh8J8uM4wTZx41K2lLSEp/3oMp917ODVVMtW5Me4epCmQ3gH8D+0b+/t4xxkUKutyhimTA==} + srvx@1.0.5: + resolution: {integrity: sha512-KvSKRpgPG/oaq3cyT614OQ2bAa7DynuGamivCZeoZzIUULOdbQz6wUtnnVuC4+DCx2Zglzo8v5gBYmWIWYhDxA==} engines: {node: '>=20.16.0'} hasBin: true - srvx@0.10.1: - resolution: {integrity: sha512-A//xtfak4eESMWWydSRFUVvCTQbSwivnGCEf8YGPe2eHU0+Z6znfUTCPF0a7oV3sObSOcrXHlL6Bs9vVctfXdg==} - engines: {node: '>=20.16.0'} - hasBin: true - - srvx@0.11.12: - resolution: {integrity: sha512-AQfrGqntqVPXgP03pvBDN1KyevHC+KmYVqb8vVf4N+aomQqdhaZxjvoVp+AOm4u6x+GgNQY3MVzAUIn+TqwkOA==} - engines: {node: '>=20.16.0'} - hasBin: true - - srvx@0.11.15: - resolution: {integrity: sha512-iXsux0UcOjdvs0LCMa2Ws3WwcDUozA3JN3BquNXkaFPP7TpRqgunKdEgoZ/uwb1J6xaYHfxtz9Twlh6yzwM6Tg==} - engines: {node: '>=20.16.0'} - hasBin: true - - srvx@0.11.18: - resolution: {integrity: sha512-7/EW5sPdC1bU7iq1tgTvCZqUQDkJdsqIVzYqBv7SuBfQQ10oWkKj4KYNOw0H4Ig26bXuUYDA7XTKxB+/HC5SRw==} - engines: {node: '>=20.16.0'} - hasBin: true - - srvx@0.11.22: - resolution: {integrity: sha512-LqZxxBDMKuMAZzFzJnDCkFOrs9MZQZr0LvHiO/SuSZVdQaXD7xQ5UWTUxheJrQPve1qk9MG2B/yttUvJxw8egQ==} + srvx@1.0.8: + resolution: {integrity: sha512-ngFS/J6St4PJfHRHGjr78xkPPtbyXtdMOLNE4x/XZunEK3OhV7aGUWMHf9WTUEy6wm1U0W4okkd82ZFFWRVQTw==} engines: {node: '>=20.16.0'} hasBin: true @@ -28573,12 +28207,12 @@ packages: std-env@3.9.0: resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==} - std-env@4.1.0: - resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==} - std-env@4.2.0: resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==} + std-env@4.3.0: + resolution: {integrity: sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==} + stop-iteration-iterator@1.1.0: resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} engines: {node: '>= 0.4'} @@ -28604,14 +28238,6 @@ packages: resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} engines: {node: '>=12'} - string-width@7.2.0: - resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} - engines: {node: '>=18'} - - string-width@8.2.1: - resolution: {integrity: sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==} - engines: {node: '>=20'} - string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -28642,9 +28268,6 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - strip-literal@3.1.0: - resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==} - strip-literal@4.0.0: resolution: {integrity: sha512-PaqAvfUZKBwc/SLmNZtHmzK+v19Z4O4eS3cKPeGvbIv/U3pnyEq4Tuw3/4v/FwfM8VQaEawsyCcOQ0P+kpwWWw==} @@ -28669,7 +28292,7 @@ packages: peerDependencies: '@babel/core': '*' babel-plugin-macros: '*' - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@babel/core': optional: true @@ -28713,11 +28336,19 @@ packages: swr@2.3.4: resolution: {integrity: sha512-bYd2lrhc+VarcpkgWclcUi92wYCpOgMws9Sd1hG1ntAu0NEy+14CbotuFjshBU2kt9rYj9TSmDcybpxpeTU1fg==} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + sync-child-process@1.0.2: + resolution: {integrity: sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==} + engines: {node: '>=16.0.0'} + + sync-message-port@1.2.0: + resolution: {integrity: sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==} + engines: {node: '>=16.0.0'} + tagged-tag@1.0.0: resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} engines: {node: '>=20'} @@ -28824,6 +28455,10 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} + tinybench@6.2.2: + resolution: {integrity: sha512-nIZ2N2dFpjBsg2hgitKu7mA+FvsIJuGJOwysRngmVRRmWgR/UyPjwJj8c/fT/dhm8EkHnF5EOogRf+0Z2qrimA==} + engines: {node: '>=20.0.0'} + tinyclip@0.1.15: resolution: {integrity: sha512-uo33abH+Ays0xYaDysoBt494Hb3hsEczMpcC0MwFl773pazORx4fmvKhclhR1wonUbB6vvpRsvVMwnhfqeMc+A==} engines: {node: ^16.14.0 || >= 17.3.0} @@ -28831,24 +28466,20 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyexec@1.0.2: - resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==} + tinyexec@1.3.1: + resolution: {integrity: sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==} engines: {node: '>=18'} tinyglobby@0.2.15: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} - tinyglobby@0.2.16: - resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} - tinyrainbow@3.1.0: - resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} + tinyrainbow@3.2.0: + resolution: {integrity: sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==} engines: {node: '>=14.0.0'} tldts-core@6.1.76: @@ -28982,8 +28613,8 @@ packages: resolution: {integrity: sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==} engines: {node: '>= 6.0.0'} - turbo-stream@3.2.0: - resolution: {integrity: sha512-EK+bZ9UVrVh7JLslVFOV0GEMsociOqVOvEMTAd4ixMyffN5YNIEdLZWXUx5PJqDbTxSIBWw04HS9gCY4frYQDQ==} + turbo-stream@3.2.1: + resolution: {integrity: sha512-BaX0eWz3IrypOVDFqPv3VGD6uZZW8y3oFAOJqZQ+oopmOyQ8/xNm7IMwAJFvxax2DBa8zSk+/AeqA6D6b1PXGg==} type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -29001,10 +28632,6 @@ packages: resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} engines: {node: '>=16'} - type-fest@5.4.1: - resolution: {integrity: sha512-xygQcmneDyzsEuKZrFbRMne5HDqMs++aFzefrJTgEIKjQ3rekM+RPfFCVq2Gp1VIDqddoYeppCj4Pcb+RZW0GQ==} - engines: {node: '>=20'} - type-fest@5.9.0: resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} engines: {node: '>=20'} @@ -29092,15 +28719,9 @@ packages: resolution: {integrity: sha512-dPJyqPzx8preQhqq24bBG1YNkvigm87K8kVEHCD+ruZg24t6IFEFv00xMWfxcC4djmFtiTLdFuADn4+DOz6R7Q==} hasBin: true - ultrahtml@1.6.0: - resolution: {integrity: sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==} - uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} - unctx@2.5.0: - resolution: {integrity: sha512-p+Rz9x0R7X+CYDkT+Xg8/GhpcShTlU8n+cf9OtOEf7zEQsNcCZO1dPKNRDqvUTaq+P32PMMkxWHwfrxkqfqAYg==} - undici-types@7.16.0: resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} @@ -29119,6 +28740,14 @@ packages: resolution: {integrity: sha512-uZsKNuzQxDMUY6M3pIMvy5tvlGmtq8XJ2oLAkfRKGNu+1VQAIvLy2xIVG5ATZl5wDXl/tddByAWCizRbOme+TA==} engines: {node: '>=20.18.1'} + undici@7.29.0: + resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==} + engines: {node: '>=20.18.1'} + + undici@7.30.1: + resolution: {integrity: sha512-03KrMbjIFDWQR5RNPrSw3bd1r12JpyFQl9/yxjUbJtqkjmllqC5lFjZh6ujeuJCKr8EOQvRW872Oy/az+nLYxg==} + engines: {node: '>=20.18.1'} + unenv@2.0.0-rc.24: resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==} @@ -29134,18 +28763,6 @@ packages: resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==} engines: {node: '>=20'} - unimport@6.4.0: - resolution: {integrity: sha512-JJOOuNMFq8b4ZPBKwQUxEcba4MplskDzYI1Lvrf8rJfWphZTWvPNXWa493qsPngHUmub89w6C7j+SeLWTE/UIQ==} - engines: {node: '>=18.12.0'} - peerDependencies: - oxc-parser: '*' - rolldown: ^1.0.0 - peerDependenciesMeta: - oxc-parser: - optional: true - rolldown: - optional: true - universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -29162,14 +28779,6 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - unplugin-utils@0.3.1: - resolution: {integrity: sha512-5lWVjgi6vuHhJ526bI4nlCOmkCIF3nnfXkCMDeMJrtdvxTs6ZFCM8oNufGTsDbKv/tJ/xj8RpvXjRuPBZJuJog==} - engines: {node: '>=20.19.0'} - - unplugin-utils@0.3.2: - resolution: {integrity: sha512-xVToRh2CTmLk2HnEG7ac4rl1MJTT3RFkpS8B++/SnB0kXvuaavD+n3m/vrzyWQOdJNSZQACnbz01pnppbwV5BA==} - engines: {node: '>=20.19.0'} - unplugin@1.0.1: resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} @@ -29177,22 +28786,25 @@ packages: resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==} engines: {node: '>=18.12.0'} - unplugin@3.3.0: - resolution: {integrity: sha512-qa66K+crbfyE6JK10GjvbJeRrOsuC/JpbnHctfyp/i4oBTxWOzJfRZyDiOk1PtErMFRu8JhsU/wPvOdBNWe5Rg==} + unplugin@3.7.0: + resolution: {integrity: sha512-GrM2uq3DQo3hvLU2FjeYhooJ8BY9N6j1Fbzgx7Pta3VVJevsD3VP4dPjZkZOS0mLvN8w9zzr9OlP+31bSMyuLw==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@farmfe/core': '*' + '@rsbuild/core': '*' '@rspack/core': '*' bun-types-no-globals: '*' esbuild: '*' rolldown: '*' rollup: '*' unloader: '*' - vite: ^8.0.14 + vite: ^8.3.4 webpack: '*' peerDependenciesMeta: '@farmfe/core': optional: true + '@rsbuild/core': + optional: true '@rspack/core': optional: true bun-types-no-globals: @@ -29275,153 +28887,8 @@ packages: uploadthing: optional: true - unstorage@2.0.0-alpha.5: - resolution: {integrity: sha512-Sj8btci21Twnd6M+N+MHhjg3fVn6lAPElPmvFTe0Y/wR0WImErUdA1PzlAaUavHylJ7uDiFwlZDQKm0elG4b7g==} - peerDependencies: - '@azure/app-configuration': ^1.9.0 - '@azure/cosmos': ^4.7.0 - '@azure/data-tables': ^13.3.1 - '@azure/identity': ^4.13.0 - '@azure/keyvault-secrets': ^4.10.0 - '@azure/storage-blob': ^12.29.1 - '@capacitor/preferences': ^6.0.3 || ^7.0.0 - '@deno/kv': '>=0.12.0' - '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0 - '@planetscale/database': ^1.19.0 - '@upstash/redis': ^1.35.6 - '@vercel/blob': '>=0.27.3' - '@vercel/functions': ^2.2.12 || ^3.0.0 - '@vercel/kv': ^1.0.1 - aws4fetch: ^1.0.20 - chokidar: ^4 || ^5 - db0: '>=0.3.4' - idb-keyval: ^6.2.2 - ioredis: ^5.8.2 - lru-cache: ^11.2.2 - mongodb: ^6 || ^7 - ofetch: '*' - uploadthing: ^7.7.4 - peerDependenciesMeta: - '@azure/app-configuration': - optional: true - '@azure/cosmos': - optional: true - '@azure/data-tables': - optional: true - '@azure/identity': - optional: true - '@azure/keyvault-secrets': - optional: true - '@azure/storage-blob': - optional: true - '@capacitor/preferences': - optional: true - '@deno/kv': - optional: true - '@netlify/blobs': - optional: true - '@planetscale/database': - optional: true - '@upstash/redis': - optional: true - '@vercel/blob': - optional: true - '@vercel/functions': - optional: true - '@vercel/kv': - optional: true - aws4fetch: - optional: true - chokidar: - optional: true - db0: - optional: true - idb-keyval: - optional: true - ioredis: - optional: true - lru-cache: - optional: true - mongodb: - optional: true - ofetch: - optional: true - uploadthing: - optional: true - - unstorage@2.0.0-alpha.6: - resolution: {integrity: sha512-w5vLYCJtnSx3OBtDk7cG4c1p3dfAnHA4WSZq9Xsurjbl2wMj7zqfOIjaHQI1Bl7yKzUxXAi+kbMr8iO2RhJmBA==} - peerDependencies: - '@azure/app-configuration': ^1.11.0 - '@azure/cosmos': ^4.9.1 - '@azure/data-tables': ^13.3.2 - '@azure/identity': ^4.13.0 - '@azure/keyvault-secrets': ^4.10.0 - '@azure/storage-blob': ^12.31.0 - '@capacitor/preferences': ^6 || ^7 || ^8 - '@deno/kv': '>=0.13.0' - '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0 - '@planetscale/database': ^1.19.0 - '@upstash/redis': ^1.36.2 - '@vercel/blob': '>=0.27.3' - '@vercel/functions': ^2.2.12 || ^3.0.0 - '@vercel/kv': ^1.0.1 - aws4fetch: ^1.0.20 - chokidar: ^4 || ^5 - db0: '>=0.3.4' - idb-keyval: ^6.2.2 - ioredis: ^5.9.3 - lru-cache: ^11.2.6 - mongodb: ^6 || ^7 - ofetch: '*' - uploadthing: ^7.7.4 - peerDependenciesMeta: - '@azure/app-configuration': - optional: true - '@azure/cosmos': - optional: true - '@azure/data-tables': - optional: true - '@azure/identity': - optional: true - '@azure/keyvault-secrets': - optional: true - '@azure/storage-blob': - optional: true - '@capacitor/preferences': - optional: true - '@deno/kv': - optional: true - '@netlify/blobs': - optional: true - '@planetscale/database': - optional: true - '@upstash/redis': - optional: true - '@vercel/blob': - optional: true - '@vercel/functions': - optional: true - '@vercel/kv': - optional: true - aws4fetch: - optional: true - chokidar: - optional: true - db0: - optional: true - idb-keyval: - optional: true - ioredis: - optional: true - lru-cache: - optional: true - mongodb: - optional: true - ofetch: - optional: true - uploadthing: - optional: true + unstorage@2.0.0-alpha.10: + resolution: {integrity: sha512-6h1veZp8gnp4dGllf0tDijoXxDYymJu251IpKKkrSVH+QHL6tXFbwG85KM+CBHSgpkkgtPuIiZ9oLCLP5+1Evw==} until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} @@ -29430,13 +28897,6 @@ packages: resolution: {integrity: sha512-+NnOJcSiEtYsVgJmXUzQbJeRAFXJC4yPJYuh6kF9B0Rm6zunXcs/3GZOTllyocSbUDIxD6Bj7e/4ATw7sph1Sw==} hasBin: true - untyped@2.0.0: - resolution: {integrity: sha512-nwNCjxJTjNuLCgFr42fEak5OcLuB3ecca+9ksPFNvtfYSLpjf+iJqSIaSnIile6ZPbKYxI5k2AfXqeopGudK/g==} - hasBin: true - - unwasm@0.5.3: - resolution: {integrity: sha512-keBgTSfp3r6+s9ZcSma+0chwxQdmLbB5+dAD9vjtB21UTMYuKAxHXCU1K2CbCtnP09EaWeRvACnXk0EJtUx+hw==} - update-browserslist-db@1.1.2: resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==} hasBin: true @@ -29469,7 +28929,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -29479,7 +28939,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ^19.2.3 + react: ~19.2.9 peerDependenciesMeta: '@types/react': optional: true @@ -29487,7 +28947,7 @@ packages: use-sync-external-store@1.6.0: resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==} peerDependencies: - react: ^19.2.3 + react: ~19.2.9 util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -29507,10 +28967,6 @@ packages: deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). hasBin: true - uuid@11.1.0: - resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} - hasBin: true - uuid@8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). @@ -29539,6 +28995,9 @@ packages: resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + varint@6.0.0: + resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==} + vary@1.1.2: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} @@ -29548,7 +29007,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: typescript: '*' - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29556,14 +29015,14 @@ packages: vite-plugin-externalize-deps@0.10.0: resolution: {integrity: sha512-eQrtpT/Do7AvDn76l1yL6ZHyXJ+UWH2LaHVqhAes9go54qaAnPZuMbgxcroQ/7WY3ZyetZzYW2quQnDF0DV5qg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vite-plugin-solid@2.11.10: resolution: {integrity: sha512-Yr1dQybmtDtDAHkii6hXuc1oVH9CPcS/Zb2jN/P36qqcrkNnVPsMTzQ06jyzFPFjj3U1IYKMVt/9ZqcwGCEbjw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: 1.9.12 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29573,7 +29032,7 @@ packages: peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: 1.9.12 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29581,15 +29040,15 @@ packages: vite-tsconfig-paths@6.1.1: resolution: {integrity: sha512-2cihq7zliibCCZ8P9cKJrQBkfgdvcFkOOc3Y02o3GWUDLgqjWsZudaoiuOwO/gzTzy17cS5F7ZPo4bsnS4DGkg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 - vite@8.0.14: - resolution: {integrity: sha512-s4BJJ+5y1pYL6Otw51FHhVJQhPnuRinKig64g/1+EUNaJsd3gCKdD31IPFvswUgW9/60QT9oFHbZHbQK5imcxw==} + vite@8.3.4: + resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': 25.0.9 - '@vitejs/devtools': ^0.1.18 + '@vitejs/devtools': ^0.7.1 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -29629,7 +29088,7 @@ packages: vitefu@1.1.1: resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29637,7 +29096,7 @@ packages: vitefu@1.1.3: resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29658,7 +29117,48 @@ packages: '@vitest/ui': 4.1.4 happy-dom: '*' jsdom: '*' - vite: ^8.0.14 + vite: ^8.3.4 + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@opentelemetry/api': + optional: true + '@types/node': + optional: true + '@vitest/browser-playwright': + optional: true + '@vitest/browser-preview': + optional: true + '@vitest/browser-webdriverio': + optional: true + '@vitest/coverage-istanbul': + optional: true + '@vitest/coverage-v8': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + + vitest@5.0.4: + resolution: {integrity: sha512-z0WxZRV2Sg48wF0FSgMq3TFG8JS38/Qr96vZVZdX6+Em9raQTvnXQvdTFJe2m3rfyJnEHeHQ/snceIdi8D1pVg==} + engines: {node: ^22.12.0 || ^24.0.0 || >=26.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@opentelemetry/api': ^1.9.0 + '@types/node': 25.0.9 + '@vitest/browser-playwright': 5.0.4 + '@vitest/browser-preview': 5.0.4 + '@vitest/browser-webdriverio': ^5.0.0-beta.5 || >=5.0.0 + '@vitest/coverage-istanbul': 5.0.4 + '@vitest/coverage-v8': 5.0.4 + '@vitest/ui': 5.0.4 + happy-dom: '*' + jsdom: '*' + vite: ^8.3.4 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -29918,6 +29418,11 @@ packages: engines: {node: '>=8'} hasBin: true + why-is-node-running@3.2.1: + resolution: {integrity: sha512-Tb2FUhB4vUsGQlfSquQLYkApkuPAFQXGFzxWKHHumVz2dK+X1RUm/HnID4+TfIGYJ1kTcwOaCk/buYCEJr6YjQ==} + engines: {node: '>=20.11'} + hasBin: true + wildcard@2.0.1: resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} @@ -29938,6 +29443,11 @@ packages: engines: {node: '>=16'} hasBin: true + workerd@1.20261104.1: + resolution: {integrity: sha512-JuiKY9k/4V4UE2xsupaTvZ1SF6o2a8sg+/zfq/DaSDwvH+o7t2ZEFuIWNEnryfeFdP47/tz/p828Kvl4ptPlrA==} + engines: {node: '>=16'} + hasBin: true + wrangler@4.75.0: resolution: {integrity: sha512-Efk1tcnm4eduBYpH1sSjMYydXMnIFPns/qABI3+fsbDrUk5GksNYX8nYGVP4sFygvGPO7kJc36YJKB5ooA7JAg==} engines: {node: '>=20.0.0'} @@ -29960,17 +29470,9 @@ packages: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} engines: {node: '>=12'} - wrap-ansi@9.0.2: - resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} - engines: {node: '>=18'} - wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - write-file-atomic@5.0.1: - resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - ws@8.18.0: resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} @@ -29995,9 +29497,17 @@ packages: utf-8-validate: optional: true - wsl-utils@0.3.1: - resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==} - engines: {node: '>=20'} + ws@8.21.0: + resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true xml-name-validator@4.0.0: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} @@ -30050,10 +29560,6 @@ packages: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} - yargs-parser@22.0.0: - resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} - engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yargs@16.2.0: resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} engines: {node: '>=10'} @@ -30062,10 +29568,6 @@ packages: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} - yargs@18.1.0: - resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==} - engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yauzl@3.4.0: resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} engines: {node: '>=12'} @@ -30088,16 +29590,9 @@ packages: youch@4.1.0-beta.10: resolution: {integrity: sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==} - youch@4.1.1: - resolution: {integrity: sha512-mxW3qiSnl+GRxXsaUMzv2Mbada1Y8CDltET9UxejDQe6DBYlSekghl5U5K0ReAikcHDi0G1vKZEmmo/NWAGKLA==} - zeptomatch@2.0.2: resolution: {integrity: sha512-H33jtSKf8Ijtb5BW6wua3G5DhnFjbFML36eFu+VdOoVY4HD9e7ggjqdM6639B+L87rjnR6Y+XeRzBXZdy52B/g==} - zip-stream@6.0.1: - resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} - engines: {node: '>= 14'} - zip-stream@7.0.5: resolution: {integrity: sha512-dSvYKdvLsAHCDqPOhIwk/q5CvuWtTB3Dgpoe0uVEFjTzIOAmsQpprX25InCvrvJsirEbu1OHyy67n/kAj1Sw/w==} engines: {node: '>=18'} @@ -30114,13 +29609,16 @@ packages: zod@4.5.4: resolution: {integrity: sha512-sC95tT5iHHH9gtpj6A81kh+NEaRAUFN+qlUPDUbRfOMvNf5QCBqsb3WgvnpVtK5Y+4UfA6KqufotuTvMGiTlsA==} + zod@4.6.6: + resolution: {integrity: sha512-4UmzQUF5fxvfcYHlbjBmejU+w+hbDnWFx4aS8kBx7nPBHcO2SqPbpAG8snbdg+Xse4pRefR98hgjFgIMCI/UhA==} + zustand@5.0.12: resolution: {integrity: sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g==} engines: {node: '>=12.20.0'} peerDependencies: '@types/react': ^19.2.8 immer: '>=9.0.6' - react: ^19.2.3 + react: ~19.2.9 use-sync-external-store: '>=1.2.0' peerDependenciesMeta: '@types/react': @@ -30157,7 +29655,7 @@ snapshots: cjs-module-lexer: 1.4.3 fflate: 0.8.3 lru-cache: 11.5.1 - semver: 7.8.2 + semver: 7.8.5 typescript: 5.6.1-rc validate-npm-package-name: 5.0.1 @@ -30293,26 +29791,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/core@7.29.7(supports-color@7.2.0)': - dependencies: - '@babel/code-frame': 7.29.7 - '@babel/generator': 7.29.8 - '@babel/helper-compilation-targets': 7.29.7 - '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/helpers': 7.29.7 - '@babel/parser': 7.29.8 - '@babel/template': 7.29.7 - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - '@jridgewell/remapping': 2.3.5 - convert-source-map: 2.0.0 - debug: 4.4.3(supports-color@7.2.0) - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/generator@7.29.8': dependencies: '@babel/parser': 7.29.8 @@ -30362,15 +29840,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-create-class-features-plugin@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': + '@babel/helper-create-class-features-plugin@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-member-expression-to-functions': 7.27.1(supports-color@7.2.0) + '@babel/helper-member-expression-to-functions': 7.27.1(supports-color@10.2.2) '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/helper-replace-supers': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@7.2.0) - '@babel/traverse': 7.29.8(supports-color@7.2.0) + '@babel/helper-replace-supers': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) + '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@10.2.2) + '@babel/traverse': 7.29.8(supports-color@10.2.2) semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -30388,19 +29866,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-create-class-features-plugin@7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@7.2.0) - '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@7.2.0) - '@babel/traverse': 7.29.8(supports-color@7.2.0) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/helper-globals@7.28.0': {} '@babel/helper-globals@7.29.7': {} @@ -30412,13 +29877,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-member-expression-to-functions@7.27.1(supports-color@7.2.0)': - dependencies: - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-member-expression-to-functions@7.28.5(supports-color@10.2.2)': dependencies: '@babel/traverse': 7.29.8(supports-color@10.2.2) @@ -30426,13 +29884,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-member-expression-to-functions@7.28.5(supports-color@7.2.0)': - dependencies: - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-module-imports@7.18.6': dependencies: '@babel/types': 7.29.8 @@ -30444,13 +29895,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-module-imports@7.27.1(supports-color@7.2.0)': - dependencies: - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-module-imports@7.28.6(supports-color@10.2.2)': dependencies: '@babel/traverse': 7.29.8(supports-color@10.2.2) @@ -30465,13 +29909,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-module-imports@7.29.7(supports-color@7.2.0)': - dependencies: - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.5(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@babel/core': 7.28.5(supports-color@10.2.2) @@ -30508,15 +29945,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-module-imports': 7.29.7(supports-color@7.2.0) - '@babel/helper-validator-identifier': 7.29.7 - '@babel/traverse': 7.29.8(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - '@babel/helper-optimise-call-expression@7.27.1': dependencies: '@babel/types': 7.29.8 @@ -30534,12 +29962,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-replace-supers@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': + '@babel/helper-replace-supers@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) + '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@10.2.2) '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/traverse': 7.29.8(supports-color@7.2.0) + '@babel/traverse': 7.29.8(supports-color@10.2.2) transitivePeerDependencies: - supports-color @@ -30552,15 +29980,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@7.2.0) - '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/traverse': 7.29.8(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - '@babel/helper-skip-transparent-expression-wrappers@7.27.1(supports-color@10.2.2)': dependencies: '@babel/traverse': 7.29.8(supports-color@10.2.2) @@ -30568,13 +29987,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-skip-transparent-expression-wrappers@7.27.1(supports-color@7.2.0)': - dependencies: - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-string-parser@7.29.7': {} '@babel/helper-validator-identifier@7.29.7': {} @@ -30630,19 +30042,14 @@ snapshots: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.28.5(supports-color@10.2.2))': dependencies: '@babel/core': 7.28.5(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))': + '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.27.1 '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.7(supports-color@10.2.2))': @@ -30650,11 +30057,6 @@ snapshots: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.7(supports-color@7.2.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) @@ -30679,24 +30081,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-modules-commonjs@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.27.1 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - '@babel/helper-plugin-utils': 7.28.6 - - '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-typescript@7.27.1(@babel/core@7.28.5(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@babel/core': 7.28.5(supports-color@10.2.2) @@ -30708,14 +30092,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-typescript@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': + '@babel/plugin-transform-typescript@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-create-class-features-plugin': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) + '@babel/helper-create-class-features-plugin': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0)) + '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@10.2.2) + '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) transitivePeerDependencies: - supports-color @@ -30730,17 +30114,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.28.6 - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) - transitivePeerDependencies: - - supports-color - '@babel/preset-typescript@7.27.1(@babel/core@7.28.5(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@babel/core': 7.28.5(supports-color@10.2.2) @@ -30752,14 +30125,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/preset-typescript@7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': + '@babel/preset-typescript@7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/helper-plugin-utils': 7.27.1 '@babel/helper-validator-option': 7.27.1 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@babel/plugin-transform-typescript': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) + '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) + '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) + '@babel/plugin-transform-typescript': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) transitivePeerDependencies: - supports-color @@ -30820,18 +30193,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/traverse@7.29.8(supports-color@7.2.0)': - dependencies: - '@babel/code-frame': 7.29.7 - '@babel/generator': 7.29.8 - '@babel/helper-globals': 7.29.7 - '@babel/parser': 7.29.8 - '@babel/template': 7.29.7 - '@babel/types': 7.29.8 - debug: 4.4.3(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - '@babel/types@7.29.8': dependencies: '@babel/helper-string-parser': 7.29.7 @@ -30873,13 +30234,13 @@ snapshots: '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 - '@better-auth/prisma-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@better-auth/prisma-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))': dependencies: '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 optionalDependencies: - '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) - prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) + prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@better-auth/telemetry@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)': dependencies: @@ -30899,6 +30260,8 @@ snapshots: dependencies: css-tree: 3.2.1 + '@bufbuild/protobuf@2.16.0': {} + '@bundled-es-modules/cookie@2.0.1': dependencies: cookie: 0.7.2 @@ -30926,7 +30289,7 @@ snapshots: outdent: 0.5.0 prettier: 2.8.8 resolve-from: 5.0.0 - semver: 7.8.2 + semver: 7.8.5 '@changesets/assemble-release-plan@6.0.9': dependencies: @@ -30935,7 +30298,7 @@ snapshots: '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 - semver: 7.8.2 + semver: 7.8.5 '@changesets/changelog-git@0.2.1': dependencies: @@ -31000,7 +30363,7 @@ snapshots: '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 picocolors: 1.1.1 - semver: 7.8.2 + semver: 7.8.5 '@changesets/get-github-info@0.8.0': dependencies: @@ -31097,9 +30460,9 @@ snapshots: fast-wrap-ansi: 0.2.0 sisteransi: 1.0.5 - '@clerk/backend@2.18.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/backend@2.18.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/shared': 3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/shared': 3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@clerk/types': 4.95.0 cookie: 1.0.2 standardwebhooks: 1.0.0 @@ -31108,82 +30471,82 @@ snapshots: - react - react-dom - '@clerk/backend@2.29.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/backend@2.29.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/shared': 3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/types': 4.101.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/shared': 3.42.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/types': 4.101.10(react-dom@19.2.9(react@19.2.9))(react@19.2.9) standardwebhooks: 1.0.0 tslib: 2.8.1 transitivePeerDependencies: - react - react-dom - '@clerk/clerk-react@5.53.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/clerk-react@5.53.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/shared': 3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/shared': 3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@clerk/types': 4.95.0 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) tslib: 2.8.1 - '@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/shared': 3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@clerk/shared': 3.42.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) tslib: 2.8.1 - '@clerk/shared@3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/shared@3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@clerk/types': 4.95.0 dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 std-env: 3.10.0 - swr: 2.3.4(react@19.2.3) + swr: 2.3.4(react@19.2.9) optionalDependencies: - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) - '@clerk/shared@3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/shared@3.42.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: csstype: 3.1.3 dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 std-env: 3.10.0 - swr: 2.3.4(react@19.2.3) + swr: 2.3.4(react@19.2.9) optionalDependencies: - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) - '@clerk/tanstack-react-start@0.19.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/tanstack-react-start@0.19.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/backend': 2.18.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/clerk-react': 5.53.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/shared': 3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/backend': 2.18.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/clerk-react': 5.53.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/shared': 3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@clerk/types': 4.95.0 '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) tslib: 2.8.1 - '@clerk/tanstack-react-start@0.27.14(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/tanstack-react-start@0.27.14(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/backend': 2.29.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/clerk-react': 5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/shared': 3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@clerk/types': 4.101.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/backend': 2.29.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/clerk-react': 5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/shared': 3.42.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/types': 4.101.10(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) tslib: 2.8.1 - '@clerk/types@4.101.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@clerk/types@4.101.10(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@clerk/shared': 3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@clerk/shared': 3.42.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) transitivePeerDependencies: - react - react-dom @@ -31192,20 +30555,62 @@ snapshots: dependencies: csstype: 3.1.3 + '@cloudflare/build-output-utils@0.9.10': + dependencies: + '@cloudflare/config': 0.30.2 + + '@cloudflare/config@0.30.2': + dependencies: + zod: 4.6.6 + '@cloudflare/kv-asset-handler@0.4.2': {} + '@cloudflare/runtime-types@0.1.23(@types/node@25.0.9)': + dependencies: + miniflare: 5.20261104.0-beta(@types/node@25.0.9) + workerd: 1.20261104.1 + transitivePeerDependencies: + - '@types/node' + - bufferutil + - utf-8-validate + '@cloudflare/unenv-preset@2.15.0(unenv@2.0.0-rc.24)(workerd@1.20260317.1)': dependencies: unenv: 2.0.0-rc.24 optionalDependencies: workerd: 1.20260317.1 - '@cloudflare/vite-plugin@1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)': + '@cloudflare/unenv-preset@2.15.0(unenv@2.0.0-rc.24)(workerd@1.20261104.1)': + dependencies: + unenv: 2.0.0-rc.24 + optionalDependencies: + workerd: 1.20261104.1 + + '@cloudflare/unenv-preset@2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261104.1)': + dependencies: + unenv: 2.0.0-rc.24 + optionalDependencies: + workerd: 1.20261104.1 + + '@cloudflare/vite-plugin@1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)': dependencies: '@cloudflare/unenv-preset': 2.15.0(unenv@2.0.0-rc.24)(workerd@1.20260317.1) miniflare: 4.20260317.0 unenv: 2.0.0-rc.24 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + wrangler: 4.75.0 + ws: 8.18.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + - workerd + + '@cloudflare/vite-plugin@1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20261104.1)(wrangler@4.75.0)': + dependencies: + '@cloudflare/unenv-preset': 2.15.0(unenv@2.0.0-rc.24)(workerd@1.20261104.1) + miniflare: 4.20260317.0 + unenv: 2.0.0-rc.24 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: 4.75.0 ws: 8.18.0 transitivePeerDependencies: @@ -31216,22 +30621,36 @@ snapshots: '@cloudflare/workerd-darwin-64@1.20260317.1': optional: true + '@cloudflare/workerd-darwin-64@1.20261104.1': + optional: true + '@cloudflare/workerd-darwin-arm64@1.20260317.1': optional: true + '@cloudflare/workerd-darwin-arm64@1.20261104.1': + optional: true + '@cloudflare/workerd-linux-64@1.20260317.1': optional: true + '@cloudflare/workerd-linux-64@1.20261104.1': + optional: true + '@cloudflare/workerd-linux-arm64@1.20260317.1': optional: true + '@cloudflare/workerd-linux-arm64@1.20261104.1': + optional: true + '@cloudflare/workerd-windows-64@1.20260317.1': optional: true - '@codspeed/core@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)': + '@cloudflare/workerd-windows-64@1.20261104.1': + optional: true + + '@codspeed/core@6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - axios: 1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2) - find-up: 6.3.0 + axios: 1.18.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) form-data: 4.0.6 node-gyp-build: 4.8.4 stack-trace: 1.0.0-pre2 @@ -31239,12 +30658,12 @@ snapshots: - debug - supports-color - '@codspeed/vitest-plugin@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4)': + '@codspeed/vitest-plugin@6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@6.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@5.0.4)': dependencies: - '@codspeed/core': 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2) - tinybench: 2.9.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + '@codspeed/core': 6.0.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) + tinybench: 6.2.2 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitest: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - debug - supports-color @@ -31254,15 +30673,15 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9))(hono@4.13.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - better-auth: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + better-auth: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) common-tags: 1.8.2 - convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) - convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(zod@3.25.76) + convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9) + convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9))(hono@4.13.9)(react@19.2.9)(zod@3.25.76) jose: 6.1.0 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) remeda: 2.32.0 semver: 7.7.3 type-fest: 4.41.0 @@ -31272,10 +30691,10 @@ snapshots: - hono - typescript - '@convex-dev/react-query@0.0.0-alpha.8(@tanstack/react-query@5.102.0(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@convex-dev/react-query@0.0.0-alpha.8(@tanstack/react-query@5.102.0(react@19.2.9))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9))': dependencies: - '@tanstack/react-query': 5.102.0(react@19.2.3) - convex: 1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@tanstack/react-query': 5.102.0(react@19.2.9) + convex: 1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9) '@cspotcode/source-map-support@0.8.1': dependencies: @@ -31364,18 +30783,6 @@ snapshots: '@electric-sql/pglite@0.3.2': {} - '@emnapi/core@1.10.0': - dependencies: - '@emnapi/wasi-threads': 1.2.1 - tslib: 2.8.1 - optional: true - - '@emnapi/core@1.11.1': - dependencies: - '@emnapi/wasi-threads': 1.2.2 - tslib: 2.8.1 - optional: true - '@emnapi/core@1.11.3': dependencies: '@emnapi/wasi-threads': 1.2.3 @@ -31386,16 +30793,6 @@ snapshots: '@emnapi/wasi-threads': 1.0.4 tslib: 2.8.1 - '@emnapi/runtime@1.10.0': - dependencies: - tslib: 2.8.1 - optional: true - - '@emnapi/runtime@1.11.1': - dependencies: - tslib: 2.8.1 - optional: true - '@emnapi/runtime@1.11.3': dependencies: tslib: 2.8.1 @@ -31408,16 +30805,6 @@ snapshots: dependencies: tslib: 2.8.1 - '@emnapi/wasi-threads@1.2.1': - dependencies: - tslib: 2.8.1 - optional: true - - '@emnapi/wasi-threads@1.2.2': - dependencies: - tslib: 2.8.1 - optional: true - '@emnapi/wasi-threads@1.2.3': dependencies: tslib: 2.8.1 @@ -31454,17 +30841,17 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2)': + '@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2)': dependencies: '@babel/runtime': 7.26.7 '@emotion/babel-plugin': 11.13.5(supports-color@10.2.2) '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 - '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.3) + '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.9) '@emotion/utils': 1.4.2 '@emotion/weak-memoize': 0.4.0 hoist-non-react-statics: 3.3.2 - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 transitivePeerDependencies: @@ -31480,16 +30867,16 @@ snapshots: '@emotion/sheet@1.4.0': {} - '@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2)': + '@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2)': dependencies: '@babel/runtime': 7.26.7 '@emotion/babel-plugin': 11.13.5(supports-color@10.2.2) '@emotion/is-prop-valid': 1.3.1 - '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) '@emotion/serialize': 1.3.3 - '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.3) + '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.9) '@emotion/utils': 1.4.2 - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 transitivePeerDependencies: @@ -31497,9 +30884,9 @@ snapshots: '@emotion/unitless@0.10.0': {} - '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.2.3)': + '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 '@emotion/utils@1.4.2': {} @@ -31530,9 +30917,6 @@ snapshots: '@esbuild/aix-ppc64@0.28.1': optional: true - '@esbuild/aix-ppc64@0.28.2': - optional: true - '@esbuild/android-arm64@0.23.0': optional: true @@ -31551,9 +30935,6 @@ snapshots: '@esbuild/android-arm64@0.28.1': optional: true - '@esbuild/android-arm64@0.28.2': - optional: true - '@esbuild/android-arm@0.23.0': optional: true @@ -31572,9 +30953,6 @@ snapshots: '@esbuild/android-arm@0.28.1': optional: true - '@esbuild/android-arm@0.28.2': - optional: true - '@esbuild/android-x64@0.23.0': optional: true @@ -31593,9 +30971,6 @@ snapshots: '@esbuild/android-x64@0.28.1': optional: true - '@esbuild/android-x64@0.28.2': - optional: true - '@esbuild/darwin-arm64@0.23.0': optional: true @@ -31614,9 +30989,6 @@ snapshots: '@esbuild/darwin-arm64@0.28.1': optional: true - '@esbuild/darwin-arm64@0.28.2': - optional: true - '@esbuild/darwin-x64@0.23.0': optional: true @@ -31635,9 +31007,6 @@ snapshots: '@esbuild/darwin-x64@0.28.1': optional: true - '@esbuild/darwin-x64@0.28.2': - optional: true - '@esbuild/freebsd-arm64@0.23.0': optional: true @@ -31656,9 +31025,6 @@ snapshots: '@esbuild/freebsd-arm64@0.28.1': optional: true - '@esbuild/freebsd-arm64@0.28.2': - optional: true - '@esbuild/freebsd-x64@0.23.0': optional: true @@ -31677,9 +31043,6 @@ snapshots: '@esbuild/freebsd-x64@0.28.1': optional: true - '@esbuild/freebsd-x64@0.28.2': - optional: true - '@esbuild/linux-arm64@0.23.0': optional: true @@ -31698,9 +31061,6 @@ snapshots: '@esbuild/linux-arm64@0.28.1': optional: true - '@esbuild/linux-arm64@0.28.2': - optional: true - '@esbuild/linux-arm@0.23.0': optional: true @@ -31719,9 +31079,6 @@ snapshots: '@esbuild/linux-arm@0.28.1': optional: true - '@esbuild/linux-arm@0.28.2': - optional: true - '@esbuild/linux-ia32@0.23.0': optional: true @@ -31740,9 +31097,6 @@ snapshots: '@esbuild/linux-ia32@0.28.1': optional: true - '@esbuild/linux-ia32@0.28.2': - optional: true - '@esbuild/linux-loong64@0.23.0': optional: true @@ -31761,9 +31115,6 @@ snapshots: '@esbuild/linux-loong64@0.28.1': optional: true - '@esbuild/linux-loong64@0.28.2': - optional: true - '@esbuild/linux-mips64el@0.23.0': optional: true @@ -31782,9 +31133,6 @@ snapshots: '@esbuild/linux-mips64el@0.28.1': optional: true - '@esbuild/linux-mips64el@0.28.2': - optional: true - '@esbuild/linux-ppc64@0.23.0': optional: true @@ -31803,9 +31151,6 @@ snapshots: '@esbuild/linux-ppc64@0.28.1': optional: true - '@esbuild/linux-ppc64@0.28.2': - optional: true - '@esbuild/linux-riscv64@0.23.0': optional: true @@ -31824,9 +31169,6 @@ snapshots: '@esbuild/linux-riscv64@0.28.1': optional: true - '@esbuild/linux-riscv64@0.28.2': - optional: true - '@esbuild/linux-s390x@0.23.0': optional: true @@ -31845,9 +31187,6 @@ snapshots: '@esbuild/linux-s390x@0.28.1': optional: true - '@esbuild/linux-s390x@0.28.2': - optional: true - '@esbuild/linux-x64@0.23.0': optional: true @@ -31866,9 +31205,6 @@ snapshots: '@esbuild/linux-x64@0.28.1': optional: true - '@esbuild/linux-x64@0.28.2': - optional: true - '@esbuild/netbsd-arm64@0.25.10': optional: true @@ -31884,9 +31220,6 @@ snapshots: '@esbuild/netbsd-arm64@0.28.1': optional: true - '@esbuild/netbsd-arm64@0.28.2': - optional: true - '@esbuild/netbsd-x64@0.23.0': optional: true @@ -31905,9 +31238,6 @@ snapshots: '@esbuild/netbsd-x64@0.28.1': optional: true - '@esbuild/netbsd-x64@0.28.2': - optional: true - '@esbuild/openbsd-arm64@0.23.0': optional: true @@ -31926,9 +31256,6 @@ snapshots: '@esbuild/openbsd-arm64@0.28.1': optional: true - '@esbuild/openbsd-arm64@0.28.2': - optional: true - '@esbuild/openbsd-x64@0.23.0': optional: true @@ -31947,9 +31274,6 @@ snapshots: '@esbuild/openbsd-x64@0.28.1': optional: true - '@esbuild/openbsd-x64@0.28.2': - optional: true - '@esbuild/openharmony-arm64@0.25.10': optional: true @@ -31962,9 +31286,6 @@ snapshots: '@esbuild/openharmony-arm64@0.28.1': optional: true - '@esbuild/openharmony-arm64@0.28.2': - optional: true - '@esbuild/sunos-x64@0.23.0': optional: true @@ -31983,9 +31304,6 @@ snapshots: '@esbuild/sunos-x64@0.28.1': optional: true - '@esbuild/sunos-x64@0.28.2': - optional: true - '@esbuild/win32-arm64@0.23.0': optional: true @@ -32004,9 +31322,6 @@ snapshots: '@esbuild/win32-arm64@0.28.1': optional: true - '@esbuild/win32-arm64@0.28.2': - optional: true - '@esbuild/win32-ia32@0.23.0': optional: true @@ -32025,9 +31340,6 @@ snapshots: '@esbuild/win32-ia32@0.28.1': optional: true - '@esbuild/win32-ia32@0.28.2': - optional: true - '@esbuild/win32-x64@0.23.0': optional: true @@ -32046,9 +31358,6 @@ snapshots: '@esbuild/win32-x64@0.28.1': optional: true - '@esbuild/win32-x64@0.28.2': - optional: true - '@eslint-community/eslint-utils@4.4.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))': dependencies: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) @@ -32059,21 +31368,11 @@ snapshots: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-visitor-keys: 3.4.3 - '@eslint-community/eslint-utils@4.9.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))': - dependencies: - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-visitor-keys: 3.4.3 - '@eslint-community/eslint-utils@4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))': dependencies: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-visitor-keys: 3.4.3 - '@eslint-community/eslint-utils@4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))': - dependencies: - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-visitor-keys: 3.4.3 - '@eslint-community/regexpp@4.12.1': {} '@eslint-community/regexpp@4.12.2': {} @@ -32179,14 +31478,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/config-array@0.19.2(supports-color@7.2.0)': - dependencies: - '@eslint/object-schema': 2.1.6 - debug: 4.4.3(supports-color@7.2.0) - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - '@eslint/config-helpers@0.1.0': {} '@eslint/core@0.12.0': @@ -32207,23 +31498,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/eslintrc@3.3.0(supports-color@7.2.0)': - dependencies: - ajv: 6.12.6 - debug: 4.4.3(supports-color@7.2.0) - espree: 10.4.0 - globals: 14.0.0 - ignore: 5.3.2 - import-fresh: 3.3.0 - js-yaml: 4.1.1 - minimatch: 3.1.2 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - - '@eslint/js@10.0.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))': + '@eslint/js@10.0.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))': optionalDependencies: - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) '@eslint/js@9.22.0': {} @@ -32245,7 +31522,7 @@ snapshots: '@fastify/ajv-compiler@4.0.5': dependencies: ajv: 8.17.1 - ajv-formats: 3.0.1(ajv@8.17.1) + ajv-formats: 3.0.1 fast-uri: 3.0.6 '@fastify/busboy@3.1.1': {} @@ -32594,11 +31871,11 @@ snapshots: '@floating-ui/core': 1.6.9 '@floating-ui/utils': 0.2.9 - '@floating-ui/react-dom@2.1.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@floating-ui/react-dom@2.1.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@floating-ui/dom': 1.6.13 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) '@floating-ui/utils@0.2.9': {} @@ -32620,6 +31897,11 @@ snapshots: dependencies: hono: 4.7.10 + '@hono/session@0.2.1(hono@4.13.9)': + dependencies: + hono: 4.13.9 + jose: 6.1.3 + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.6': @@ -32647,6 +31929,11 @@ snapshots: '@img/sharp-libvips-darwin-arm64': 1.3.3 optional: true + '@img/sharp-darwin-arm64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.3.4 + optional: true + '@img/sharp-darwin-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-darwin-x64': 1.2.4 @@ -32657,71 +31944,111 @@ snapshots: '@img/sharp-libvips-darwin-x64': 1.3.3 optional: true + '@img/sharp-darwin-x64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-darwin-x64': 1.3.4 + optional: true + '@img/sharp-freebsd-wasm32@0.35.4': dependencies: '@img/sharp-wasm32': 0.35.4 optional: true + '@img/sharp-freebsd-wasm32@0.35.5': + dependencies: + '@img/sharp-wasm32': 0.35.5 + optional: true + '@img/sharp-libvips-darwin-arm64@1.2.4': optional: true '@img/sharp-libvips-darwin-arm64@1.3.3': optional: true + '@img/sharp-libvips-darwin-arm64@1.3.4': + optional: true + '@img/sharp-libvips-darwin-x64@1.2.4': optional: true '@img/sharp-libvips-darwin-x64@1.3.3': optional: true + '@img/sharp-libvips-darwin-x64@1.3.4': + optional: true + '@img/sharp-libvips-linux-arm64@1.2.4': optional: true '@img/sharp-libvips-linux-arm64@1.3.3': optional: true + '@img/sharp-libvips-linux-arm64@1.3.4': + optional: true + '@img/sharp-libvips-linux-arm@1.2.4': optional: true '@img/sharp-libvips-linux-arm@1.3.3': optional: true + '@img/sharp-libvips-linux-arm@1.3.4': + optional: true + '@img/sharp-libvips-linux-ppc64@1.2.4': optional: true '@img/sharp-libvips-linux-ppc64@1.3.3': optional: true + '@img/sharp-libvips-linux-ppc64@1.3.4': + optional: true + '@img/sharp-libvips-linux-riscv64@1.2.4': optional: true '@img/sharp-libvips-linux-riscv64@1.3.3': optional: true + '@img/sharp-libvips-linux-riscv64@1.3.4': + optional: true + '@img/sharp-libvips-linux-s390x@1.2.4': optional: true '@img/sharp-libvips-linux-s390x@1.3.3': optional: true + '@img/sharp-libvips-linux-s390x@1.3.4': + optional: true + '@img/sharp-libvips-linux-x64@1.2.4': optional: true '@img/sharp-libvips-linux-x64@1.3.3': optional: true + '@img/sharp-libvips-linux-x64@1.3.4': + optional: true + '@img/sharp-libvips-linuxmusl-arm64@1.2.4': optional: true '@img/sharp-libvips-linuxmusl-arm64@1.3.3': optional: true + '@img/sharp-libvips-linuxmusl-arm64@1.3.4': + optional: true + '@img/sharp-libvips-linuxmusl-x64@1.2.4': optional: true '@img/sharp-libvips-linuxmusl-x64@1.3.3': optional: true + '@img/sharp-libvips-linuxmusl-x64@1.3.4': + optional: true + '@img/sharp-linux-arm64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-arm64': 1.2.4 @@ -32732,6 +32059,11 @@ snapshots: '@img/sharp-libvips-linux-arm64': 1.3.3 optional: true + '@img/sharp-linux-arm64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm64': 1.3.4 + optional: true + '@img/sharp-linux-arm@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-arm': 1.2.4 @@ -32742,6 +32074,11 @@ snapshots: '@img/sharp-libvips-linux-arm': 1.3.3 optional: true + '@img/sharp-linux-arm@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm': 1.3.4 + optional: true + '@img/sharp-linux-ppc64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-ppc64': 1.2.4 @@ -32752,6 +32089,11 @@ snapshots: '@img/sharp-libvips-linux-ppc64': 1.3.3 optional: true + '@img/sharp-linux-ppc64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-ppc64': 1.3.4 + optional: true + '@img/sharp-linux-riscv64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-riscv64': 1.2.4 @@ -32762,6 +32104,11 @@ snapshots: '@img/sharp-libvips-linux-riscv64': 1.3.3 optional: true + '@img/sharp-linux-riscv64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-riscv64': 1.3.4 + optional: true + '@img/sharp-linux-s390x@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-s390x': 1.2.4 @@ -32772,6 +32119,11 @@ snapshots: '@img/sharp-libvips-linux-s390x': 1.3.3 optional: true + '@img/sharp-linux-s390x@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-s390x': 1.3.4 + optional: true + '@img/sharp-linux-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-x64': 1.2.4 @@ -32782,6 +32134,11 @@ snapshots: '@img/sharp-libvips-linux-x64': 1.3.3 optional: true + '@img/sharp-linux-x64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linux-x64': 1.3.4 + optional: true + '@img/sharp-linuxmusl-arm64@0.34.5': optionalDependencies: '@img/sharp-libvips-linuxmusl-arm64': 1.2.4 @@ -32792,6 +32149,11 @@ snapshots: '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 optional: true + '@img/sharp-linuxmusl-arm64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-arm64': 1.3.4 + optional: true + '@img/sharp-linuxmusl-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-linuxmusl-x64': 1.2.4 @@ -32802,6 +32164,11 @@ snapshots: '@img/sharp-libvips-linuxmusl-x64': 1.3.3 optional: true + '@img/sharp-linuxmusl-x64@0.35.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-x64': 1.3.4 + optional: true + '@img/sharp-wasm32@0.34.5': dependencies: '@emnapi/runtime': 1.11.3 @@ -32812,29 +32179,48 @@ snapshots: '@emnapi/runtime': 1.11.3 optional: true + '@img/sharp-wasm32@0.35.5': + dependencies: + '@emnapi/runtime': 1.11.3 + optional: true + '@img/sharp-webcontainers-wasm32@0.35.4': dependencies: '@img/sharp-wasm32': 0.35.4 optional: true + '@img/sharp-webcontainers-wasm32@0.35.5': + dependencies: + '@img/sharp-wasm32': 0.35.5 + optional: true + '@img/sharp-win32-arm64@0.34.5': optional: true '@img/sharp-win32-arm64@0.35.4': optional: true + '@img/sharp-win32-arm64@0.35.5': + optional: true + '@img/sharp-win32-ia32@0.34.5': optional: true '@img/sharp-win32-ia32@0.35.4': optional: true + '@img/sharp-win32-ia32@0.35.5': + optional: true + '@img/sharp-win32-x64@0.34.5': optional: true '@img/sharp-win32-x64@0.35.4': optional: true + '@img/sharp-win32-x64@0.35.5': + optional: true + '@import-maps/resolve@2.0.0': {} '@inlang/paraglide-js@2.4.0(babel-plugin-macros@3.1.0)': @@ -32922,7 +32308,8 @@ snapshots: optionalDependencies: '@types/node': 25.0.9 - '@ioredis/commands@1.10.0': {} + '@ioredis/commands@1.10.0': + optional: true '@isaacs/cliui@8.0.2': dependencies: @@ -32958,6 +32345,8 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/sourcemap-codec@1.6.0': {} + '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -32966,7 +32355,7 @@ snapshots: '@jridgewell/trace-mapping@0.3.9': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 '@jsonjoy.com/base64@1.1.2(tslib@2.8.1)': dependencies: @@ -33137,7 +32526,7 @@ snapshots: https-proxy-agent: 7.0.6(supports-color@10.2.2) node-fetch: 2.7.0 nopt: 8.1.0 - semver: 7.8.2 + semver: 7.8.5 tar: 7.4.3 transitivePeerDependencies: - encoding @@ -33248,37 +32637,37 @@ snapshots: '@mui/core-downloads-tracker@6.4.7': {} - '@mui/material@6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@mui/material@6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 '@mui/core-downloads-tracker': 6.4.7 - '@mui/system': 6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3) + '@mui/system': 6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9) '@mui/types': 7.2.21(@types/react@19.2.9) - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) '@popperjs/core': 2.11.8 '@types/react-transition-group': 4.4.12(@types/react@19.2.9) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) react-is: 19.0.0 - react-transition-group: 4.4.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + react-transition-group: 4.4.5(react-dom@19.2.9(react@19.2.9))(react@19.2.9) optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) - '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) + '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) '@types/react': 19.2.9 - '@mui/private-theming@6.4.6(@types/react@19.2.9)(react@19.2.3)': + '@mui/private-theming@6.4.6(@types/react@19.2.9)(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) prop-types: 15.8.1 - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@mui/styled-engine@6.4.6(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(react@19.2.3)': + '@mui/styled-engine@6.4.6(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 '@emotion/cache': 11.14.0 @@ -33286,39 +32675,39 @@ snapshots: '@emotion/sheet': 1.4.0 csstype: 3.2.3 prop-types: 15.8.1 - react: 19.2.3 + react: 19.2.9 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) - '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) + '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) - '@mui/system@6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)': + '@mui/system@6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 - '@mui/private-theming': 6.4.6(@types/react@19.2.9)(react@19.2.3) - '@mui/styled-engine': 6.4.6(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(react@19.2.3) + '@mui/private-theming': 6.4.6(@types/react@19.2.9)(react@19.2.9) + '@mui/styled-engine': 6.4.6(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(react@19.2.9) '@mui/types': 7.2.21(@types/react@19.2.9) - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) clsx: 2.1.1 csstype: 3.2.3 prop-types: 15.8.1 - react: 19.2.3 + react: 19.2.9 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) - '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) + '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) + '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) '@types/react': 19.2.9 '@mui/types@7.2.21(@types/react@19.2.9)': optionalDependencies: '@types/react': 19.2.9 - '@mui/utils@6.4.6(@types/react@19.2.9)(react@19.2.3)': + '@mui/utils@6.4.6(@types/react@19.2.9)(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 '@mui/types': 7.2.21(@types/react@19.2.9) '@types/prop-types': 15.7.14 clsx: 2.1.1 prop-types: 15.8.1 - react: 19.2.3 + react: 19.2.9 react-is: 19.0.0 optionalDependencies: '@types/react': 19.2.9 @@ -33330,7 +32719,7 @@ snapshots: dependencies: '@emnapi/core': 1.11.3 '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.2 + '@tybys/wasm-util': 0.10.3 optional: true '@napi-rs/wasm-runtime@0.2.4': @@ -33339,41 +32728,6 @@ snapshots: '@emnapi/runtime': 1.11.3 '@tybys/wasm-util': 0.9.0 - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.2 - optional: true - - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': - dependencies: - '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.2 - optional: true - - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': - dependencies: - '@emnapi/core': 1.11.3 - '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.2 - optional: true - - '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': - dependencies: - '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.1 - '@tybys/wasm-util': 0.10.3 - optional: true - - '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.3 - optional: true - '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: '@emnapi/core': 1.11.3 @@ -33395,12 +32749,6 @@ snapshots: '@netlify/binary-info@1.0.0': {} - '@netlify/blobs@10.1.0': - dependencies: - '@netlify/dev-utils': 4.3.0 - '@netlify/runtime-utils': 2.2.0 - optional: true - '@netlify/blobs@11.0.3(supports-color@10.2.2)': dependencies: '@netlify/dev-utils': 6.0.1 @@ -33438,32 +32786,13 @@ snapshots: validate-npm-package-name: 5.0.1 yaml: 2.9.0 yargs: 17.7.2 - zod: 4.5.4 + zod: 4.6.6 '@netlify/database-dev@1.0.1': dependencies: '@electric-sql/pglite': 0.3.16 pg-gateway: 0.3.0-beta.4 - '@netlify/dev-utils@4.3.0': - dependencies: - '@whatwg-node/server': 0.10.13 - ansis: 4.3.1 - chokidar: 4.0.3 - decache: 4.6.2 - dettle: 1.0.5 - dot-prop: 9.0.0 - empathic: 2.0.0 - env-paths: 3.0.0 - image-size: 2.0.2 - js-image-generator: 1.0.4 - parse-gitignore: 2.0.0 - semver: 7.8.5 - tmp-promise: 3.0.3 - uuid: 11.1.0 - write-file-atomic: 5.0.1 - optional: true - '@netlify/dev-utils@6.0.1': dependencies: '@whatwg-node/server': 0.11.0 @@ -33478,7 +32807,7 @@ snapshots: parse-gitignore: 2.0.0 semver: 7.8.5 - '@netlify/dev@5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/dev@5.1.0(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2)': dependencies: '@netlify/ai': 1.0.1 '@netlify/blobs': 11.0.3(supports-color@10.2.2) @@ -33488,7 +32817,7 @@ snapshots: '@netlify/edge-functions-dev': 2.0.1 '@netlify/functions-dev': 2.0.5(rollup@4.63.1)(supports-color@10.2.2) '@netlify/headers': 3.0.1 - '@netlify/images': 2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + '@netlify/images': 2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(srvx@1.0.5) '@netlify/redirects': 4.0.2 '@netlify/runtime': 5.0.3(supports-color@10.2.2) '@netlify/server-dev': 0.1.1 @@ -33591,9 +32920,9 @@ snapshots: dependencies: '@netlify/headers-parser': 10.1.1 - '@netlify/images@2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))': + '@netlify/images@2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(srvx@1.0.5)': dependencies: - ipx: 3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + ipx: 3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(srvx@1.0.5) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33642,9 +32971,6 @@ snapshots: jsonwebtoken: 9.0.3 netlify-redirector: 0.5.0 - '@netlify/runtime-utils@2.2.0': - optional: true - '@netlify/runtime-utils@3.0.0': {} '@netlify/runtime@5.0.3(supports-color@10.2.2)': @@ -33678,10 +33004,10 @@ snapshots: '@netlify/types@3.0.0': {} - '@netlify/vite-plugin-tanstack-start@1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@netlify/vite-plugin-tanstack-start@1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@netlify/vite-plugin': 3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + '@netlify/vite-plugin': 3.0.1(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: '@tanstack/solid-start': link:packages/solid-start transitivePeerDependencies: @@ -33712,12 +33038,12 @@ snapshots: - supports-color - uploadthing - '@netlify/vite-plugin@3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@netlify/vite-plugin@3.0.1(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@netlify/dev': 5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/dev': 5.1.0(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(srvx@1.0.5)(supports-color@10.2.2) '@netlify/dev-utils': 6.0.1 dedent: 1.7.2(babel-plugin-macros@3.1.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33780,7 +33106,7 @@ snapshots: unixify: 1.0.0 urlpattern-polyfill: 8.0.2 yargs: 17.7.2 - zod: 4.5.4 + zod: 4.6.6 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -33832,43 +33158,43 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.19.0 - '@nx/devkit@23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': + '@nx/devkit@24.0.0(nx@24.0.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': dependencies: ejs: 5.0.1 minimatch: 10.2.5 - nx: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + nx: 24.0.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2))(@swc/core@1.15.33(@swc/helpers@0.5.23)) semver: 7.8.5 tslib: 2.8.1 yargs-parser: 21.1.1 - '@nx/nx-darwin-arm64@23.2.0': + '@nx/nx-darwin-arm64@24.0.0': optional: true - '@nx/nx-darwin-x64@23.2.0': + '@nx/nx-darwin-x64@24.0.0': optional: true - '@nx/nx-freebsd-x64@23.2.0': + '@nx/nx-freebsd-x64@24.0.0': optional: true - '@nx/nx-linux-arm-gnueabihf@23.2.0': + '@nx/nx-linux-arm-gnueabihf@24.0.0': optional: true - '@nx/nx-linux-arm64-gnu@23.2.0': + '@nx/nx-linux-arm64-gnu@24.0.0': optional: true - '@nx/nx-linux-arm64-musl@23.2.0': + '@nx/nx-linux-arm64-musl@24.0.0': optional: true - '@nx/nx-linux-x64-gnu@23.2.0': + '@nx/nx-linux-x64-gnu@24.0.0': optional: true - '@nx/nx-linux-x64-musl@23.2.0': + '@nx/nx-linux-x64-musl@24.0.0': optional: true - '@nx/nx-win32-arm64-msvc@23.2.0': + '@nx/nx-win32-arm64-msvc@24.0.0': optional: true - '@nx/nx-win32-x64-msvc@23.2.0': + '@nx/nx-win32-x64-msvc@24.0.0': optional: true '@one-ini/wasm@0.1.1': {} @@ -33957,74 +33283,7 @@ snapshots: '@opentelemetry/semantic-conventions@1.41.1': {} - '@oxc-minify/binding-android-arm-eabi@0.110.0': - optional: true - - '@oxc-minify/binding-android-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-darwin-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-darwin-x64@0.110.0': - optional: true - - '@oxc-minify/binding-freebsd-x64@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm-gnueabihf@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm-musleabihf@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-linux-ppc64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-riscv64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-riscv64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-linux-s390x-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-x64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-x64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-openharmony-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@oxc-minify/binding-win32-arm64-msvc@0.110.0': - optional: true - - '@oxc-minify/binding-win32-ia32-msvc@0.110.0': - optional: true - - '@oxc-minify/binding-win32-x64-msvc@0.110.0': - optional: true - - '@oxc-project/types@0.115.0': {} - - '@oxc-project/types@0.132.0': {} + '@oxc-project/types@0.153.0': {} '@oxc-resolver/binding-android-arm-eabi@11.19.1': optional: true @@ -34074,9 +33333,9 @@ snapshots: '@oxc-resolver/binding-openharmony-arm64@11.19.1': optional: true - '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': + '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -34091,71 +33350,6 @@ snapshots: '@oxc-resolver/binding-win32-x64-msvc@11.19.1': optional: true - '@oxc-transform/binding-android-arm-eabi@0.110.0': - optional: true - - '@oxc-transform/binding-android-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-darwin-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-darwin-x64@0.110.0': - optional: true - - '@oxc-transform/binding-freebsd-x64@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm-gnueabihf@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm-musleabihf@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-linux-ppc64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-riscv64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-riscv64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-linux-s390x-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-x64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-x64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-openharmony-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@oxc-transform/binding-win32-arm64-msvc@0.110.0': - optional: true - - '@oxc-transform/binding-win32-ia32-msvc@0.110.0': - optional: true - - '@oxc-transform/binding-win32-x64-msvc@0.110.0': - optional: true - '@panva/hkdf@1.2.1': {} '@parcel/watcher-android-arm64@2.5.1': @@ -34347,10 +33541,6 @@ snapshots: '@popperjs/core@2.11.8': {} - '@poppinss/colors@4.1.5': - dependencies: - kleur: 4.1.5 - '@poppinss/colors@4.1.6': dependencies: kleur: 4.1.5 @@ -34361,12 +33551,6 @@ snapshots: '@sindresorhus/is': 7.1.0 supports-color: 10.2.2 - '@poppinss/dumper@0.7.0': - dependencies: - '@poppinss/colors': 4.1.5 - '@sindresorhus/is': 7.1.0 - supports-color: 10.2.2 - '@poppinss/exception@1.2.2': {} '@prisma/adapter-libsql@7.0.0': @@ -34380,11 +33564,11 @@ snapshots: '@prisma/client-runtime-utils@7.0.0': {} - '@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))': dependencies: '@prisma/client-runtime-utils': 7.0.0 optionalDependencies: - prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) typescript: '@typescript/typescript6@6.0.2' '@prisma/config@7.0.0': @@ -34451,11 +33635,11 @@ snapshots: '@prisma/query-plan-executor@6.18.0': {} - '@prisma/studio-core-licensed@0.8.0(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@prisma/studio-core-licensed@0.8.0(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@types/react': 19.2.9 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) '@protobufjs/aspromise@1.1.2': {} @@ -34488,836 +33672,780 @@ snapshots: '@radix-ui/primitive@1.1.2': {} - '@radix-ui/react-accessible-icon@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-accessible-icon@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-accordion@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-accordion@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-alert-dialog@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-alert-dialog@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-arrow@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-arrow@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-aspect-ratio@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-aspect-ratio@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-avatar@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-avatar@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-checkbox@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-checkbox@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-collapsible@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-collapsible@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-collection@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-collection@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-context-menu@2.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-context-menu@2.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-context@1.1.2(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-context@1.1.2(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-dialog@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-dialog@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) aria-hidden: 1.2.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-direction@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-direction@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-dismissable-layer@1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-dismissable-layer@1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-dropdown-menu@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-dropdown-menu@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-focus-guards@1.1.2(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-focus-guards@1.1.2(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-focus-scope@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-focus-scope@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-form@0.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-form@0.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-label': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-label': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-hover-card@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-hover-card@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-id@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-id@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-label@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-label@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-menu@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-menu@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) aria-hidden: 1.2.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-menubar@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-menubar@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-navigation-menu@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-navigation-menu@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-popover@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-popover@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) aria-hidden: 1.2.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-popper@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-popper@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@floating-ui/react-dom': 2.1.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-arrow': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) + '@floating-ui/react-dom': 2.1.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-arrow': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) '@radix-ui/rect': 1.1.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-portal@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-portal@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-presence@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-presence@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-primitive@2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-primitive@2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-progress@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-progress@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-radio-group@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-radio-group@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-roving-focus@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-roving-focus@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-scroll-area@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-scroll-area@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/number': 1.1.1 '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-select@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-select@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/number': 1.1.1 '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) aria-hidden: 1.2.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + react-remove-scroll: 2.6.3(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-separator@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-separator@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-slider@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-slider@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/number': 1.1.1 '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-slot@1.2.0(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-slot@1.2.0(@types/react@19.2.9)(react@19.2.9)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-switch@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-switch@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-tabs@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-tabs@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-toast@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-toast@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-toggle-group@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-toggle-group@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toggle': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toggle': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-toggle@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-toggle@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-toolbar@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-toolbar@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-separator': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toggle-group': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-separator': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toggle-group': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-tooltip@1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-tooltip@1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-controllable-state@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-controllable-state@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: '@radix-ui/rect': 1.1.1 - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-size@1.1.1(@types/react@19.2.9)(react@19.2.3)': + '@radix-ui/react-use-size@1.1.1(@types/react@19.2.9)(react@19.2.9)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - react: 19.2.3 + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + react: 19.2.9 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-visually-hidden@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/react-visually-hidden@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) '@radix-ui/rect@1.1.1': {} - '@radix-ui/themes@3.3.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@radix-ui/themes@3.3.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@radix-ui/colors': 3.0.0 classnames: 2.5.1 - radix-ui: 1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - react-remove-scroll-bar: 2.3.8(@types/react@19.2.9)(react@19.2.3) + radix-ui: 1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + react-remove-scroll-bar: 2.3.8(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@rolldown/binding-android-arm64@1.0.0-rc.9': + '@rolldown/binding-android-arm-eabi@1.2.13': optional: true - '@rolldown/binding-android-arm64@1.0.2': + '@rolldown/binding-android-arm64@1.2.13': optional: true - '@rolldown/binding-darwin-arm64@1.0.0-rc.9': + '@rolldown/binding-darwin-arm64@1.2.13': optional: true - '@rolldown/binding-darwin-arm64@1.0.2': + '@rolldown/binding-darwin-x64@1.2.13': optional: true - '@rolldown/binding-darwin-x64@1.0.0-rc.9': + '@rolldown/binding-freebsd-x64@1.2.13': optional: true - '@rolldown/binding-darwin-x64@1.0.2': + '@rolldown/binding-linux-arm-gnueabihf@1.2.13': optional: true - '@rolldown/binding-freebsd-x64@1.0.0-rc.9': + '@rolldown/binding-linux-arm64-gnu@1.2.13': optional: true - '@rolldown/binding-freebsd-x64@1.0.2': + '@rolldown/binding-linux-arm64-musl@1.2.13': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': + '@rolldown/binding-linux-ppc64-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.2': + '@rolldown/binding-linux-s390x-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': + '@rolldown/binding-linux-x64-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.2': + '@rolldown/binding-linux-x64-musl@1.2.13': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': + '@rolldown/binding-openharmony-arm64@1.2.13': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.2': + '@rolldown/binding-win32-arm64-msvc@1.2.13': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': + '@rolldown/binding-win32-x64-msvc@1.2.13': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-s390x-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-x64-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-x64-musl@1.0.2': - optional: true - - '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': - optional: true - - '@rolldown/binding-openharmony-arm64@1.0.2': - optional: true - - '@rolldown/binding-wasm32-wasi@1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@rolldown/binding-wasm32-wasi@1.0.2': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) - optional: true - - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': - optional: true - - '@rolldown/binding-win32-arm64-msvc@1.0.2': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.2': - optional: true - - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.0(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.0.2 + rolldown: 1.2.13 optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.0.2 + rolldown: 1.2.13 optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optional: true - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.0.2 + rolldown: 1.2.13 optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optional: true - '@rolldown/pluginutils@1.0.0-beta.27': {} - '@rolldown/pluginutils@1.0.0-rc.2': {} '@rolldown/pluginutils@1.0.0-rc.7': {} @@ -35326,61 +34454,6 @@ snapshots: '@rolldown/pluginutils@1.0.1': {} - '@rollup/plugin-alias@6.0.0(rollup@4.63.1)': - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-commonjs@29.0.3(rollup@4.63.1)': - dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - commondir: 1.0.1 - estree-walker: 2.0.2 - fdir: 6.5.0(picomatch@4.0.7) - is-reference: 1.2.1 - magic-string: 0.30.21 - picomatch: 4.0.7 - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-inject@5.0.5(rollup@4.63.1)': - dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - estree-walker: 2.0.2 - magic-string: 0.30.21 - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-json@6.1.0(rollup@4.63.1)': - dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-node-resolve@16.0.3(rollup@4.63.1)': - dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - '@types/resolve': 1.20.2 - deepmerge: 4.3.1 - is-module: 1.0.0 - resolve: 1.22.11 - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-replace@6.0.3(rollup@4.63.1)': - dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - magic-string: 0.30.21 - optionalDependencies: - rollup: 4.63.1 - - '@rollup/plugin-terser@1.0.0(rollup@4.63.1)': - dependencies: - serialize-javascript: 7.1.1 - smob: 1.5.0 - terser: 5.37.0 - optionalDependencies: - rollup: 4.63.1 - '@rollup/pluginutils@5.1.4(rollup@4.63.1)': dependencies: '@types/estree': 1.0.8 @@ -35464,28 +34537,14 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.63.1': optional: true - '@rsbuild/core@2.0.14': + '@rsbuild/core@2.3.1': dependencies: - '@rspack/core': 2.0.8(@swc/helpers@0.5.23) + '@rspack/core': 2.3.1(@swc/helpers@0.5.23) '@swc/helpers': 0.5.23 transitivePeerDependencies: - '@module-federation/runtime-tools' - '@rsbuild/core@2.1.1': - dependencies: - '@rspack/core': 2.1.1(@swc/helpers@0.5.23) - '@swc/helpers': 0.5.23 - transitivePeerDependencies: - - '@module-federation/runtime-tools' - - '@rsbuild/core@2.2.5': - dependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) - '@swc/helpers': 0.5.23 - transitivePeerDependencies: - - '@module-federation/runtime-tools' - - '@rsbuild/plugin-babel@1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2)': + '@rsbuild/plugin-babel@1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2)': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) @@ -35494,319 +34553,222 @@ snapshots: '@types/babel__core': 7.20.5 reduce-configs: 1.1.1 optionalDependencies: - '@rsbuild/core': 2.1.1 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - supports-color - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: - '@rsbuild/core': 2.0.14 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - '@rspack/core' - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': + '@rsbuild/plugin-sass@2.0.1(@rsbuild/core@2.3.1)': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) - react-refresh: 0.18.0 + deepmerge: 4.3.1 + loader-utils: 2.0.4 + postcss: 8.5.29 + reduce-configs: 2.0.1 + sass-embedded: 1.105.1 optionalDependencies: - '@rsbuild/core': 2.1.1 - transitivePeerDependencies: - - '@rspack/core' + '@rsbuild/core': 2.3.1 - '@rsbuild/plugin-solid@1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(solid-js@1.9.12)(supports-color@10.2.2)': + '@rsbuild/plugin-solid@1.1.1(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(solid-js@1.9.12)(supports-color@10.2.2)': dependencies: - '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@10.2.2))(solid-js@1.9.12) solid-refresh: 0.7.8(solid-js@1.9.12) optionalDependencies: - '@rsbuild/core': 2.1.1 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - '@babel/core' - solid-js - supports-color - '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: - '@tailwindcss/webpack': 4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) + '@tailwindcss/webpack': 4.3.1(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3) optionalDependencies: - '@rsbuild/core': 2.0.14 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - '@rspack/core' - webpack - '@rsbuild/plugin-vue-jsx@2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2)': + '@rsbuild/plugin-vue-jsx@2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.3.1)(supports-color@10.2.2)': dependencies: - '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) + '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) babel-plugin-vue-jsx-hmr: 1.0.0(supports-color@10.2.2) optionalDependencies: - '@rsbuild/core': 2.1.1 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - '@babel/core' - supports-color - '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - rspack-vue-loader: 17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + rspack-vue-loader: 17.5.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) optionalDependencies: - '@rsbuild/core': 2.1.1 + '@rsbuild/core': 2.3.1 transitivePeerDependencies: - '@rspack/core' - '@vue/compiler-sfc' - vue - '@rspack/binding-darwin-arm64@2.0.0': + '@rspack/binding-darwin-arm64@2.2.7': optional: true - '@rspack/binding-darwin-arm64@2.0.8': + '@rspack/binding-darwin-arm64@2.3.1': optional: true - '@rspack/binding-darwin-arm64@2.1.1': + '@rspack/binding-darwin-x64@2.2.7': optional: true - '@rspack/binding-darwin-arm64@2.2.3': + '@rspack/binding-darwin-x64@2.3.1': optional: true - '@rspack/binding-darwin-x64@2.0.0': + '@rspack/binding-linux-arm64-gnu@2.2.7': optional: true - '@rspack/binding-darwin-x64@2.0.8': + '@rspack/binding-linux-arm64-gnu@2.3.1': optional: true - '@rspack/binding-darwin-x64@2.1.1': + '@rspack/binding-linux-arm64-musl@2.2.7': optional: true - '@rspack/binding-darwin-x64@2.2.3': + '@rspack/binding-linux-arm64-musl@2.3.1': optional: true - '@rspack/binding-linux-arm64-gnu@2.0.0': + '@rspack/binding-linux-ppc64-gnu@2.2.7': optional: true - '@rspack/binding-linux-arm64-gnu@2.0.8': + '@rspack/binding-linux-ppc64-gnu@2.3.1': optional: true - '@rspack/binding-linux-arm64-gnu@2.1.1': + '@rspack/binding-linux-riscv64-gnu@2.2.7': optional: true - '@rspack/binding-linux-arm64-gnu@2.2.3': + '@rspack/binding-linux-riscv64-gnu@2.3.1': optional: true - '@rspack/binding-linux-arm64-musl@2.0.0': + '@rspack/binding-linux-riscv64-musl@2.2.7': optional: true - '@rspack/binding-linux-arm64-musl@2.0.8': + '@rspack/binding-linux-riscv64-musl@2.3.1': optional: true - '@rspack/binding-linux-arm64-musl@2.1.1': + '@rspack/binding-linux-s390x-gnu@2.2.7': optional: true - '@rspack/binding-linux-arm64-musl@2.2.3': + '@rspack/binding-linux-s390x-gnu@2.3.1': optional: true - '@rspack/binding-linux-ppc64-gnu@2.2.3': + '@rspack/binding-linux-x64-gnu@2.2.7': optional: true - '@rspack/binding-linux-riscv64-gnu@2.1.1': + '@rspack/binding-linux-x64-gnu@2.3.1': optional: true - '@rspack/binding-linux-riscv64-gnu@2.2.3': + '@rspack/binding-linux-x64-musl@2.2.7': optional: true - '@rspack/binding-linux-riscv64-musl@2.1.1': + '@rspack/binding-linux-x64-musl@2.3.1': optional: true - '@rspack/binding-linux-riscv64-musl@2.2.3': - optional: true - - '@rspack/binding-linux-s390x-gnu@2.2.3': - optional: true - - '@rspack/binding-linux-x64-gnu@2.0.0': - optional: true - - '@rspack/binding-linux-x64-gnu@2.0.8': - optional: true - - '@rspack/binding-linux-x64-gnu@2.1.1': - optional: true - - '@rspack/binding-linux-x64-gnu@2.2.3': - optional: true - - '@rspack/binding-linux-x64-musl@2.0.0': - optional: true - - '@rspack/binding-linux-x64-musl@2.0.8': - optional: true - - '@rspack/binding-linux-x64-musl@2.1.1': - optional: true - - '@rspack/binding-linux-x64-musl@2.2.3': - optional: true - - '@rspack/binding-wasm32-wasi@2.0.0': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) - optional: true - - '@rspack/binding-wasm32-wasi@2.0.8': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) - optional: true - - '@rspack/binding-wasm32-wasi@2.1.1': - dependencies: - '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.1 - '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) - optional: true - - '@rspack/binding-wasm32-wasi@2.2.3': + '@rspack/binding-wasm32-wasi@2.2.7': dependencies: '@emnapi/core': 1.11.3 '@emnapi/runtime': 1.11.3 '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) optional: true - '@rspack/binding-win32-arm64-msvc@2.0.0': - optional: true - - '@rspack/binding-win32-arm64-msvc@2.0.8': - optional: true - - '@rspack/binding-win32-arm64-msvc@2.1.1': - optional: true - - '@rspack/binding-win32-arm64-msvc@2.2.3': - optional: true - - '@rspack/binding-win32-ia32-msvc@2.0.0': - optional: true - - '@rspack/binding-win32-ia32-msvc@2.0.8': - optional: true - - '@rspack/binding-win32-ia32-msvc@2.1.1': - optional: true - - '@rspack/binding-win32-ia32-msvc@2.2.3': - optional: true - - '@rspack/binding-win32-x64-msvc@2.0.0': - optional: true - - '@rspack/binding-win32-x64-msvc@2.0.8': - optional: true - - '@rspack/binding-win32-x64-msvc@2.1.1': - optional: true - - '@rspack/binding-win32-x64-msvc@2.2.3': - optional: true - - '@rspack/binding@2.0.0': - optionalDependencies: - '@rspack/binding-darwin-arm64': 2.0.0 - '@rspack/binding-darwin-x64': 2.0.0 - '@rspack/binding-linux-arm64-gnu': 2.0.0 - '@rspack/binding-linux-arm64-musl': 2.0.0 - '@rspack/binding-linux-x64-gnu': 2.0.0 - '@rspack/binding-linux-x64-musl': 2.0.0 - '@rspack/binding-wasm32-wasi': 2.0.0 - '@rspack/binding-win32-arm64-msvc': 2.0.0 - '@rspack/binding-win32-ia32-msvc': 2.0.0 - '@rspack/binding-win32-x64-msvc': 2.0.0 - - '@rspack/binding@2.0.8': - optionalDependencies: - '@rspack/binding-darwin-arm64': 2.0.8 - '@rspack/binding-darwin-x64': 2.0.8 - '@rspack/binding-linux-arm64-gnu': 2.0.8 - '@rspack/binding-linux-arm64-musl': 2.0.8 - '@rspack/binding-linux-x64-gnu': 2.0.8 - '@rspack/binding-linux-x64-musl': 2.0.8 - '@rspack/binding-wasm32-wasi': 2.0.8 - '@rspack/binding-win32-arm64-msvc': 2.0.8 - '@rspack/binding-win32-ia32-msvc': 2.0.8 - '@rspack/binding-win32-x64-msvc': 2.0.8 - - '@rspack/binding@2.1.1': - optionalDependencies: - '@rspack/binding-darwin-arm64': 2.1.1 - '@rspack/binding-darwin-x64': 2.1.1 - '@rspack/binding-linux-arm64-gnu': 2.1.1 - '@rspack/binding-linux-arm64-musl': 2.1.1 - '@rspack/binding-linux-riscv64-gnu': 2.1.1 - '@rspack/binding-linux-riscv64-musl': 2.1.1 - '@rspack/binding-linux-x64-gnu': 2.1.1 - '@rspack/binding-linux-x64-musl': 2.1.1 - '@rspack/binding-wasm32-wasi': 2.1.1 - '@rspack/binding-win32-arm64-msvc': 2.1.1 - '@rspack/binding-win32-ia32-msvc': 2.1.1 - '@rspack/binding-win32-x64-msvc': 2.1.1 - - '@rspack/binding@2.2.3': - optionalDependencies: - '@rspack/binding-darwin-arm64': 2.2.3 - '@rspack/binding-darwin-x64': 2.2.3 - '@rspack/binding-linux-arm64-gnu': 2.2.3 - '@rspack/binding-linux-arm64-musl': 2.2.3 - '@rspack/binding-linux-ppc64-gnu': 2.2.3 - '@rspack/binding-linux-riscv64-gnu': 2.2.3 - '@rspack/binding-linux-riscv64-musl': 2.2.3 - '@rspack/binding-linux-s390x-gnu': 2.2.3 - '@rspack/binding-linux-x64-gnu': 2.2.3 - '@rspack/binding-linux-x64-musl': 2.2.3 - '@rspack/binding-wasm32-wasi': 2.2.3 - '@rspack/binding-win32-arm64-msvc': 2.2.3 - '@rspack/binding-win32-ia32-msvc': 2.2.3 - '@rspack/binding-win32-x64-msvc': 2.2.3 - - '@rspack/core@2.0.0(@swc/helpers@0.5.23)': + '@rspack/binding-wasm32-wasi@2.3.1': dependencies: - '@rspack/binding': 2.0.0 + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 + '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + optional: true + + '@rspack/binding-win32-arm64-msvc@2.2.7': + optional: true + + '@rspack/binding-win32-arm64-msvc@2.3.1': + optional: true + + '@rspack/binding-win32-ia32-msvc@2.2.7': + optional: true + + '@rspack/binding-win32-ia32-msvc@2.3.1': + optional: true + + '@rspack/binding-win32-x64-msvc@2.2.7': + optional: true + + '@rspack/binding-win32-x64-msvc@2.3.1': + optional: true + + '@rspack/binding@2.2.7': + optionalDependencies: + '@rspack/binding-darwin-arm64': 2.2.7 + '@rspack/binding-darwin-x64': 2.2.7 + '@rspack/binding-linux-arm64-gnu': 2.2.7 + '@rspack/binding-linux-arm64-musl': 2.2.7 + '@rspack/binding-linux-ppc64-gnu': 2.2.7 + '@rspack/binding-linux-riscv64-gnu': 2.2.7 + '@rspack/binding-linux-riscv64-musl': 2.2.7 + '@rspack/binding-linux-s390x-gnu': 2.2.7 + '@rspack/binding-linux-x64-gnu': 2.2.7 + '@rspack/binding-linux-x64-musl': 2.2.7 + '@rspack/binding-wasm32-wasi': 2.2.7 + '@rspack/binding-win32-arm64-msvc': 2.2.7 + '@rspack/binding-win32-ia32-msvc': 2.2.7 + '@rspack/binding-win32-x64-msvc': 2.2.7 + + '@rspack/binding@2.3.1': + optionalDependencies: + '@rspack/binding-darwin-arm64': 2.3.1 + '@rspack/binding-darwin-x64': 2.3.1 + '@rspack/binding-linux-arm64-gnu': 2.3.1 + '@rspack/binding-linux-arm64-musl': 2.3.1 + '@rspack/binding-linux-ppc64-gnu': 2.3.1 + '@rspack/binding-linux-riscv64-gnu': 2.3.1 + '@rspack/binding-linux-riscv64-musl': 2.3.1 + '@rspack/binding-linux-s390x-gnu': 2.3.1 + '@rspack/binding-linux-x64-gnu': 2.3.1 + '@rspack/binding-linux-x64-musl': 2.3.1 + '@rspack/binding-wasm32-wasi': 2.3.1 + '@rspack/binding-win32-arm64-msvc': 2.3.1 + '@rspack/binding-win32-ia32-msvc': 2.3.1 + '@rspack/binding-win32-x64-msvc': 2.3.1 + + '@rspack/core@2.2.7(@swc/helpers@0.5.23)': + dependencies: + '@rspack/binding': 2.2.7 optionalDependencies: '@swc/helpers': 0.5.23 - '@rspack/core@2.0.8(@swc/helpers@0.5.23)': + '@rspack/core@2.3.1(@swc/helpers@0.5.23)': dependencies: - '@rspack/binding': 2.0.8 - optionalDependencies: - '@swc/helpers': 0.5.23 - - '@rspack/core@2.1.1(@swc/helpers@0.5.23)': - dependencies: - '@rspack/binding': 2.1.1 - optionalDependencies: - '@swc/helpers': 0.5.23 - - '@rspack/core@2.2.3(@swc/helpers@0.5.23)': - dependencies: - '@rspack/binding': 2.2.3 + '@rspack/binding': 2.3.1 optionalDependencies: '@swc/helpers': 0.5.23 '@rspack/lite-tapable@1.1.0': {} - '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0)': + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(react-refresh@0.18.0)': dependencies: react-refresh: 0.18.0 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.3.1(@swc/helpers@0.5.23) '@rushstack/node-core-library@5.7.0(@types/node@25.0.9)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) - ajv-formats: 3.0.1(ajv@8.13.0) + ajv-formats: 3.0.1 fs-extra: 7.0.1 import-lazy: 4.0.0 jju: 1.4.0 @@ -35884,20 +34846,6 @@ snapshots: - encoding - supports-color - '@sentry/bundler-plugin-core@4.6.1(supports-color@7.2.0)': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@sentry/babel-plugin-component-annotate': 4.6.1 - '@sentry/cli': 2.58.4(supports-color@7.2.0) - dotenv: 16.6.1 - find-up: 5.0.0 - glob: 10.5.0 - magic-string: 0.30.8 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - '@sentry/cli-darwin@2.58.4': optional: true @@ -35942,26 +34890,6 @@ snapshots: - encoding - supports-color - '@sentry/cli@2.58.4(supports-color@7.2.0)': - dependencies: - https-proxy-agent: 5.0.1(supports-color@7.2.0) - node-fetch: 2.7.0 - progress: 2.0.3 - proxy-from-env: 1.1.0 - which: 2.0.2 - optionalDependencies: - '@sentry/cli-darwin': 2.58.4 - '@sentry/cli-linux-arm': 2.58.4 - '@sentry/cli-linux-arm64': 2.58.4 - '@sentry/cli-linux-i686': 2.58.4 - '@sentry/cli-linux-x64': 2.58.4 - '@sentry/cli-win32-arm64': 2.58.4 - '@sentry/cli-win32-i686': 2.58.4 - '@sentry/cli-win32-x64': 2.58.4 - transitivePeerDependencies: - - encoding - - supports-color - '@sentry/core@10.32.0': {} '@sentry/core@7.120.4': @@ -35969,12 +34897,12 @@ snapshots: '@sentry/types': 7.120.4 '@sentry/utils': 7.120.4 - '@sentry/react@10.32.0(react@19.2.3)': + '@sentry/react@10.32.0(react@19.2.9)': dependencies: '@sentry/browser': 10.32.0 '@sentry/core': 10.32.0 hoist-non-react-statics: 3.3.2 - react: 19.2.3 + react: 19.2.9 '@sentry/solid@10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.12)': dependencies: @@ -36002,14 +34930,6 @@ snapshots: - encoding - supports-color - '@sentry/vite-plugin@4.6.1(supports-color@7.2.0)': - dependencies: - '@sentry/bundler-plugin-core': 4.6.1(supports-color@7.2.0) - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - '@sentry/vue@10.32.0(@tanstack/vue-router@packages+vue-router)(vue@3.5.25(typescript@5.8.3))': dependencies: '@sentry/browser': 10.32.0 @@ -36024,8 +34944,6 @@ snapshots: '@sindresorhus/is@7.1.0': {} - '@sindresorhus/merge-streams@4.0.0': {} - '@so-ric/colorspace@1.1.6': dependencies: color: 5.0.2 @@ -36123,11 +35041,11 @@ snapshots: '@standard-schema/spec@1.1.0': {} - '@stylistic/eslint-plugin@5.10.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))': + '@stylistic/eslint-plugin@5.10.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))': dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) + '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) '@typescript-eslint/types': 8.57.1 - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-visitor-keys: 4.2.1 espree: 10.4.0 estraverse: 5.3.0 @@ -36200,14 +35118,14 @@ snapshots: '@swc/core': 1.15.33(@swc/helpers@0.5.23) '@swc/types': 0.1.26 - '@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': + '@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)': dependencies: '@swc-node/core': 1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26) '@swc-node/sourcemap-support': 0.6.1 '@swc/core': 1.15.33(@swc/helpers@0.5.23) colorette: 2.0.20 - debug: 4.4.3(supports-color@7.2.0) - oxc-resolver: 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + debug: 4.4.3(supports-color@10.2.2) + oxc-resolver: 11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) pirates: 4.0.7 tslib: 2.8.1 typescript: '@typescript/typescript6@6.0.2' @@ -36421,22 +35339,29 @@ snapshots: postcss: 8.5.8 tailwindcss: 4.2.2 - '@tailwindcss/vite@4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@tailwindcss/vite@4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@tailwindcss/node': 4.2.2 '@tailwindcss/oxide': 4.2.2 tailwindcss: 4.2.2 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@tailwindcss/webpack@4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@tailwindcss/vite@4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@tailwindcss/node': 4.2.2 + '@tailwindcss/oxide': 4.2.2 + tailwindcss: 4.2.2 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + '@tailwindcss/webpack@4.3.1(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: '@alloc/quick-lru': 5.2.0 '@tailwindcss/node': 4.3.1 '@tailwindcss/oxide': 4.3.1 tailwindcss: 4.3.1 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + '@rspack/core': 2.3.1(@swc/helpers@0.5.23) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': dependencies: @@ -36503,11 +35428,11 @@ snapshots: - csstype - utf-8-validate - '@tanstack/eslint-config@0.3.2(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': + '@tanstack/eslint-config@0.3.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@eslint/js': 9.36.0 '@stylistic/eslint-plugin': 5.4.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) - eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + eslint-plugin-import-x: 4.16.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) eslint-plugin-n: 17.23.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) globals: 16.4.0 typescript-eslint: 8.44.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -36519,16 +35444,16 @@ snapshots: - supports-color - typescript - '@tanstack/eslint-config@0.4.0(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)': + '@tanstack/eslint-config@0.4.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: - '@eslint/js': 10.0.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - '@stylistic/eslint-plugin': 5.10.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - eslint-plugin-n: 17.24.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) + '@eslint/js': 10.0.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) + '@stylistic/eslint-plugin': 5.10.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) + eslint-plugin-import-x: 4.16.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + eslint-plugin-n: 17.24.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) globals: 17.4.0 - typescript-eslint: 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - vue-eslint-parser: 10.4.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) + typescript-eslint: 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + vue-eslint-parser: 10.4.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) transitivePeerDependencies: - '@typescript-eslint/utils' - eslint-import-resolver-node @@ -36547,48 +35472,48 @@ snapshots: '@tanstack/query-devtools@5.91.1': {} - '@tanstack/react-devtools@0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)': + '@tanstack/react-devtools@0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)': dependencies: '@tanstack/devtools': 0.6.14(csstype@3.2.3)(solid-js@1.9.12) '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) transitivePeerDependencies: - bufferutil - csstype - solid-js - utf-8-validate - '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3)': + '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9)': dependencies: '@tanstack/query-devtools': 5.67.2 - '@tanstack/react-query': 5.102.0(react@19.2.3) - react: 19.2.3 + '@tanstack/react-query': 5.102.0(react@19.2.9) + react: 19.2.9 - '@tanstack/react-query-devtools@5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3)': + '@tanstack/react-query-devtools@5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9)': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/react-query': 5.102.0(react@19.2.3) - react: 19.2.3 + '@tanstack/react-query': 5.102.0(react@19.2.9) + react: 19.2.9 - '@tanstack/react-query@5.102.0(react@19.2.3)': + '@tanstack/react-query@5.102.0(react@19.2.9)': dependencies: '@tanstack/query-core': 5.102.0 - react: 19.2.3 + react: 19.2.9 - '@tanstack/react-store@0.11.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@tanstack/react-store@0.11.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@tanstack/store': 0.11.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - use-sync-external-store: 1.6.0(react@19.2.3) + '@tanstack/store': 0.11.2 + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + use-sync-external-store: 1.6.0(react@19.2.9) - '@tanstack/react-virtual@3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@tanstack/react-virtual@3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@tanstack/virtual-core': 3.13.0 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) '@tanstack/solid-devtools@0.7.14(csstype@3.2.3)(solid-js@1.9.12)': dependencies: @@ -36615,7 +35540,7 @@ snapshots: '@tanstack/virtual-core': 3.13.12 solid-js: 1.9.12 - '@tanstack/store@0.11.1': {} + '@tanstack/store@0.11.2': {} '@tanstack/virtual-core@3.13.0': {} @@ -36623,36 +35548,48 @@ snapshots: '@tanstack/virtual-core@3.13.13': {} - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-tsconfig-paths: 6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + - typescript + + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(rollup@4.63.1)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(rollup@4.63.1)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup @@ -36677,11 +35614,11 @@ snapshots: '@tanstack/vue-query': 5.102.0(vue@3.5.25(typescript@5.8.3)) vue: 3.5.25(typescript@5.8.3) - '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@7.0.2)))(vue@3.5.25(typescript@7.0.2))': + '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': dependencies: '@tanstack/query-devtools': 5.91.1 - '@tanstack/vue-query': 5.102.0(vue@3.5.25(typescript@7.0.2)) - vue: 3.5.25(typescript@7.0.2) + '@tanstack/vue-query': 5.102.0(vue@3.5.25(typescript@6.0.2)) + vue: 3.5.25(typescript@6.0.2) '@tanstack/vue-query@5.102.0(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: @@ -36699,17 +35636,17 @@ snapshots: vue: 3.5.25(typescript@5.8.3) vue-demi: 0.14.10(vue@3.5.25(typescript@5.8.3)) - '@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@7.0.2))': + '@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@6.0.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 '@tanstack/query-core': 5.102.0 '@vue/devtools-api': 6.6.4 - vue: 3.5.25(typescript@7.0.2) - vue-demi: 0.14.10(vue@3.5.25(typescript@7.0.2)) + vue: 3.5.25(typescript@6.0.2) + vue-demi: 0.14.10(vue@3.5.25(typescript@6.0.2)) - '@tanstack/vue-store@0.11.1(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@tanstack/vue-store@0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - '@tanstack/store': 0.11.1 + '@tanstack/store': 0.11.2 vue: 3.5.25(@typescript/typescript6@6.0.2) vue-demi: 0.14.10(vue@3.5.25(@typescript/typescript6@6.0.2)) @@ -36749,23 +35686,36 @@ snapshots: dom-accessibility-api: 0.6.3 lodash: 4.17.21 redent: 3.0.0 + optional: true - '@testing-library/react@16.2.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4)': + dependencies: + '@adobe/css-tools': 4.4.1 + '@testing-library/dom': 10.4.1 + aria-query: 5.3.2 + css.escape: 1.5.1 + dom-accessibility-api: 0.6.3 + picocolors: 1.1.1 + redent: 3.0.0 + optionalDependencies: + vitest: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + + '@testing-library/react@16.2.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 '@testing-library/dom': 10.4.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@testing-library/react@16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@testing-library/react@16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@babel/runtime': 7.26.7 '@testing-library/dom': 10.4.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) @@ -36788,20 +35738,15 @@ snapshots: dependencies: typescript: '@typescript/typescript6@6.0.2' - '@trpc/tanstack-react-query@11.4.3(@tanstack/react-query@5.102.0(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2))(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@trpc/tanstack-react-query@11.4.3(@tanstack/react-query@5.102.0(react@19.2.9))(@trpc/client@11.4.3(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2))(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: - '@tanstack/react-query': 5.102.0(react@19.2.3) + '@tanstack/react-query': 5.102.0(react@19.2.9) '@trpc/client': 11.4.3(@trpc/server@11.4.3(@typescript/typescript6@6.0.2))(@typescript/typescript6@6.0.2) '@trpc/server': 11.4.3(@typescript/typescript6@6.0.2) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) typescript: '@typescript/typescript6@6.0.2' - '@tybys/wasm-util@0.10.2': - dependencies: - tslib: 2.8.1 - optional: true - '@tybys/wasm-util@0.10.3': dependencies: tslib: 2.8.1 @@ -36877,7 +35822,7 @@ snapshots: '@types/eslint@9.6.1': dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 '@types/estree@1.0.7': {} @@ -36968,8 +35913,6 @@ snapshots: dependencies: csstype: 3.2.3 - '@types/resolve@1.20.2': {} - '@types/retry@0.12.2': {} '@types/send@0.17.4': @@ -37012,12 +35955,6 @@ snapshots: dependencies: '@types/node': 25.0.9 - '@types/yargs-parser@21.0.3': {} - - '@types/yargs@17.0.33': - dependencies: - '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@8.44.1(@typescript-eslint/parser@8.44.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@eslint-community/regexpp': 4.12.1 @@ -37052,16 +35989,16 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/eslint-plugin@8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)': + '@typescript-eslint/eslint-plugin@8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) + '@typescript-eslint/parser': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) '@typescript-eslint/scope-manager': 8.57.1 - '@typescript-eslint/type-utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) + '@typescript-eslint/type-utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) '@typescript-eslint/visitor-keys': 8.57.1 - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - ignore: 7.0.5 + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) + ignore: 7.0.12 natural-compare: 1.4.0 ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' @@ -37116,14 +36053,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)': + '@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@typescript-eslint/scope-manager': 8.57.1 '@typescript-eslint/types': 8.57.1 - '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2) '@typescript-eslint/visitor-keys': 8.57.1 - debug: 4.4.3(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + debug: 4.4.3(supports-color@10.2.2) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: - supports-color @@ -37173,15 +36110,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': - dependencies: - '@typescript-eslint/tsconfig-utils': 8.57.1(@typescript/typescript6@6.0.2) - '@typescript-eslint/types': 8.57.1 - debug: 4.4.3(supports-color@7.2.0) - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - supports-color - '@typescript-eslint/project-service@8.57.1(supports-color@10.2.2)(typescript@5.9.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.57.1(typescript@5.9.3) @@ -37306,18 +36234,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/type-utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@typescript-eslint/types': 8.57.1 - '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0) - '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - debug: 4.4.3(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - supports-color - '@typescript-eslint/types@8.23.0': {} '@typescript-eslint/types@8.44.1': {} @@ -37334,7 +36250,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.2 + semver: 7.8.5 ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: @@ -37350,7 +36266,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.2 + semver: 7.8.5 ts-api-utils: 2.1.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: @@ -37366,7 +36282,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.2 + semver: 7.8.5 ts-api-utils: 2.1.0(typescript@5.8.3) typescript: 5.8.3 transitivePeerDependencies: @@ -37382,7 +36298,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.2 + semver: 7.8.5 ts-api-utils: 2.1.0(typescript@5.9.2) typescript: 5.9.2 transitivePeerDependencies: @@ -37396,7 +36312,7 @@ snapshots: '@typescript-eslint/visitor-keys': 8.53.0 debug: 4.4.3(supports-color@10.2.2) minimatch: 9.0.9 - semver: 7.8.2 + semver: 7.8.5 tinyglobby: 0.2.17 ts-api-utils: 2.4.0(typescript@5.9.2) typescript: 5.9.2 @@ -37418,21 +36334,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': - dependencies: - '@typescript-eslint/project-service': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0) - '@typescript-eslint/tsconfig-utils': 8.57.1(@typescript/typescript6@6.0.2) - '@typescript-eslint/types': 8.57.1 - '@typescript-eslint/visitor-keys': 8.57.1 - debug: 4.4.3(supports-color@7.2.0) - minimatch: 10.2.5 - semver: 7.8.5 - tinyglobby: 0.2.17 - ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - supports-color - '@typescript-eslint/typescript-estree@8.57.1(supports-color@10.2.2)(typescript@5.9.3)': dependencies: '@typescript-eslint/project-service': 8.57.1(supports-color@10.2.2)(typescript@5.9.3) @@ -37514,17 +36415,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - '@typescript-eslint/scope-manager': 8.57.1 - '@typescript-eslint/types': 8.57.1 - '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - supports-color - '@typescript-eslint/visitor-keys@8.23.0': dependencies: '@typescript-eslint/types': 8.23.0 @@ -37668,25 +36558,6 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': optional: true - '@vercel/nft@1.11.0(rollup@4.63.1)(supports-color@10.2.2)': - dependencies: - '@mapbox/node-pre-gyp': 2.0.0(supports-color@10.2.2) - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - acorn: 8.15.0 - acorn-import-attributes: 1.9.5(acorn@8.15.0) - async-sema: 3.1.1 - bindings: 1.5.0 - estree-walker: 2.0.2 - glob: 13.0.0 - graceful-fs: 4.2.11 - node-gyp-build: 4.8.4 - picomatch: 4.0.7 - resolve-from: 5.0.0 - transitivePeerDependencies: - - encoding - - rollup - - supports-color - '@vercel/nft@1.3.1(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@mapbox/node-pre-gyp': 2.0.0(supports-color@10.2.2) @@ -37706,188 +36577,142 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-react@4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@rolldown/pluginutils': 1.0.0-beta.27 - '@types/babel__core': 7.20.5 - react-refresh: 0.17.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-react@4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@rolldown/pluginutils': 1.0.0-beta.27 - '@types/babel__core': 7.20.5 - react-refresh: 0.17.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: 1.0.0 - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: 1.0.0 - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: 1.0.0 - '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@vitejs/plugin-rsc@0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.1 - es-module-lexer: 2.3.1 + es-module-lexer: 3.0.4 estree-walker: 3.0.3 - magic-string: 0.30.21 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - srvx: 0.11.22 - strip-literal: 3.1.0 - turbo-stream: 3.2.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + magic-string: 1.4.5 + obug: 3.0.0 + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + srvx: 1.0.8 + strip-literal: 4.0.0 + turbo-stream: 3.2.1 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitejs/plugin-rsc@0.5.39(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.1 - es-module-lexer: 2.3.1 + es-module-lexer: 3.0.4 estree-walker: 3.0.3 - magic-string: 0.30.21 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - srvx: 0.11.22 - strip-literal: 3.1.0 - turbo-stream: 3.2.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + magic-string: 1.4.5 + obug: 3.0.0 + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + srvx: 1.0.8 + strip-literal: 4.0.0 + turbo-stream: 3.2.1 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitejs/plugin-vue-jsx@4.2.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.1 '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.8.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) + '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) + '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 - '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vue: 3.5.25(@typescript/typescript6@6.0.2) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@rolldown/pluginutils': 1.0.0-rc.9 - '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vue: 3.5.25(typescript@5.8.3) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@rolldown/pluginutils': 1.0.0-rc.9 - '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.9.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@6.0.2))': dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) + '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) + '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 - '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vue: 3.5.25(typescript@7.0.2) + '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vue: 3.5.25(typescript@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) - '@vitejs/plugin-vue@6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.8.3) - '@vitejs/plugin-vue@6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.9.3) - '@vitejs/plugin-vue@6.0.5(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@6.0.2))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vue: 3.5.25(typescript@7.0.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vue: 3.5.25(typescript@6.0.2) '@vitest/expect@4.1.4': dependencies: @@ -37895,44 +36720,74 @@ snapshots: '@types/chai': 5.2.2 '@vitest/spy': 4.1.4 '@vitest/utils': 4.1.4 - chai: 6.2.2 - tinyrainbow: 3.1.0 + chai: 6.3.0 + tinyrainbow: 3.2.0 + optional: true - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + optional: true - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@vitest/spy': 4.1.4 + '@jridgewell/trace-mapping': 0.3.31 + '@vitest/spy': 5.0.4 estree-walker: 3.0.3 - magic-string: 0.30.21 + magic-string: 1.4.3 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@vitest/spy': 4.1.4 + '@jridgewell/trace-mapping': 0.3.31 + '@vitest/spy': 5.0.4 estree-walker: 3.0.3 - magic-string: 0.30.21 + magic-string: 1.4.3 + optionalDependencies: + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + '@vitest/mocker@5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@jridgewell/trace-mapping': 0.3.31 + '@vitest/spy': 5.0.4 + estree-walker: 3.0.3 + magic-string: 1.4.3 + optionalDependencies: + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + '@vitest/mocker@5.0.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@jridgewell/trace-mapping': 0.3.31 + '@vitest/spy': 5.0.4 + estree-walker: 3.0.3 + magic-string: 1.4.3 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(typescript@5.9.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) '@vitest/pretty-format@4.1.4': dependencies: - tinyrainbow: 3.1.0 + tinyrainbow: 3.2.0 + optional: true + + '@vitest/pretty-format@5.0.4': + dependencies: + tinyrainbow: 3.2.0 '@vitest/runner@4.1.4': dependencies: '@vitest/utils': 4.1.4 pathe: 2.0.3 + optional: true '@vitest/snapshot@4.1.4': dependencies: @@ -37940,25 +36795,47 @@ snapshots: '@vitest/utils': 4.1.4 magic-string: 0.30.21 pathe: 2.0.3 + optional: true - '@vitest/spy@4.1.4': {} + '@vitest/spy@4.1.4': + optional: true + + '@vitest/spy@5.0.4': {} '@vitest/ui@4.1.4(vitest@4.1.4)': dependencies: '@vitest/utils': 4.1.4 fflate: 0.8.3 - flatted: 3.4.2 + flatted: 3.4.4 pathe: 2.0.3 sirv: 3.0.2 tinyglobby: 0.2.17 - tinyrainbow: 3.1.0 - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + tinyrainbow: 3.2.0 + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + optional: true + + '@vitest/ui@5.0.4(vitest@5.0.4)': + dependencies: + '@vitest/utils': 5.0.4 + fflate: 0.8.3 + flatted: 3.4.4 + pathe: 2.0.3 + sirv: 3.0.2 + tinyrainbow: 3.2.0 + vitest: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/utils@4.1.4': dependencies: '@vitest/pretty-format': 4.1.4 convert-source-map: 2.0.0 - tinyrainbow: 3.1.0 + tinyrainbow: 3.2.0 + optional: true + + '@vitest/utils@5.0.4': + dependencies: + '@vitest/pretty-format': 5.0.4 + convert-source-map: 2.0.0 + tinyrainbow: 3.2.0 '@volar/language-core@2.4.26': dependencies: @@ -38048,22 +36925,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@vue/babel-plugin-jsx@2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/helper-module-imports': 7.27.1(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/template': 7.29.7 - '@babel/traverse': 7.29.8(supports-color@7.2.0) - '@babel/types': 7.29.8 - '@vue/babel-helper-vue-transform-on': 2.0.1 - '@vue/babel-plugin-resolve-type': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - '@vue/shared': 3.5.25 - optionalDependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - '@vue/babel-plugin-resolve-type@1.5.0(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@babel/code-frame': 7.29.7 @@ -38086,24 +36947,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@vue/babel-plugin-resolve-type@2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)': - dependencies: - '@babel/code-frame': 7.29.7 - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-module-imports': 7.27.1(supports-color@7.2.0) - '@babel/helper-plugin-utils': 7.28.6 - '@babel/parser': 7.29.8 - '@vue/compiler-sfc': 3.5.25 - transitivePeerDependencies: - - supports-color - '@vue/compiler-core@3.5.25': dependencies: '@babel/parser': 7.29.8 '@vue/shared': 3.5.25 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.2.1 + source-map-js: 1.2.2 '@vue/compiler-dom@3.5.25': dependencies: @@ -38119,8 +36969,8 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.23 - source-map-js: 1.2.1 + postcss: 8.5.29 + source-map-js: 1.2.2 '@vue/compiler-ssr@3.5.25': dependencies: @@ -38204,11 +37054,11 @@ snapshots: '@vue/shared': 3.5.25 vue: 3.5.25(typescript@5.9.3) - '@vue/server-renderer@3.5.25(vue@3.5.25(typescript@7.0.2))': + '@vue/server-renderer@3.5.25(vue@3.5.25(typescript@6.0.2))': dependencies: '@vue/compiler-ssr': 3.5.25 '@vue/shared': 3.5.25 - vue: 3.5.25(typescript@7.0.2) + vue: 3.5.25(typescript@6.0.2) '@vue/shared@3.5.25': {} @@ -38295,7 +37145,7 @@ snapshots: '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -38306,7 +37156,7 @@ snapshots: '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -38317,10 +37167,10 @@ snapshots: '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optionalDependencies: - webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) + webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) optional: true '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.4)(webpack@5.97.1)': @@ -38328,7 +37178,7 @@ snapshots: webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.27.4)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.97.1) optionalDependencies: - webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) + webpack-dev-server: 5.2.4(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) '@whatwg-node/disposablestack@0.0.6': dependencies: @@ -38351,15 +37201,6 @@ snapshots: dependencies: tslib: 2.8.1 - '@whatwg-node/server@0.10.13': - dependencies: - '@envelop/instrumentation': 1.0.0 - '@whatwg-node/disposablestack': 0.0.6 - '@whatwg-node/fetch': 0.10.13 - '@whatwg-node/promise-helpers': 1.3.2 - tslib: 2.8.1 - optional: true - '@whatwg-node/server@0.11.0': dependencies: '@envelop/instrumentation': 1.0.0 @@ -38379,13 +37220,13 @@ snapshots: iron-webcrypto: 2.0.0 jose: 6.1.3 - '@workos/authkit-tanstack-react-start@0.5.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@workos/authkit-tanstack-react-start@0.5.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': dependencies: '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start '@workos/authkit-session': 0.3.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) '@xtuc/ieee754@1.2.0': {} @@ -38417,10 +37258,6 @@ snapshots: mime-types: 3.0.1 negotiator: 1.0.0 - acorn-import-attributes@1.9.5(acorn@8.15.0): - dependencies: - acorn: 8.15.0 - acorn-import-attributes@1.9.5(acorn@8.18.0): dependencies: acorn: 8.18.0 @@ -38441,12 +37278,6 @@ snapshots: transitivePeerDependencies: - supports-color - agent-base@6.0.2(supports-color@7.2.0): - dependencies: - debug: 4.4.3(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - agent-base@7.1.3: {} ajv-draft-04@1.0.0(ajv@8.13.0): @@ -38457,16 +37288,12 @@ snapshots: dependencies: ajv: 8.18.0 - ajv-formats@2.1.1(ajv@8.18.0): - optionalDependencies: + ajv-formats@2.1.1: + dependencies: ajv: 8.18.0 - ajv-formats@3.0.1(ajv@8.13.0): - optionalDependencies: - ajv: 8.13.0 - - ajv-formats@3.0.1(ajv@8.17.1): - optionalDependencies: + ajv-formats@3.0.1: + dependencies: ajv: 8.17.1 ajv-keywords@3.5.2(ajv@6.12.6): @@ -38548,29 +37375,6 @@ snapshots: normalize-path: 3.0.0 picomatch: 2.3.1 - archiver-utils@5.0.2: - dependencies: - glob: 10.5.0 - graceful-fs: 4.2.11 - is-stream: 2.0.1 - lazystream: 1.0.1 - lodash: 4.17.21 - normalize-path: 3.0.0 - readable-stream: 4.7.0 - - archiver@7.0.1: - dependencies: - archiver-utils: 5.0.2 - async: 3.2.6 - buffer-crc32: 1.0.0 - readable-stream: 4.7.0 - readdir-glob: 1.1.3 - tar-stream: 3.2.0 - zip-stream: 6.0.1 - transitivePeerDependencies: - - bare-abort-controller - - bare-buffer - archiver@8.0.0: dependencies: async: 3.2.6 @@ -38684,9 +37488,9 @@ snapshots: aws-ssl-profiles@1.1.2: {} - axios@1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2): + axios@1.18.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2): dependencies: - follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) + follow-redirects: 1.16.0(debug@4.4.3(supports-color@10.2.2)) form-data: 4.0.6 https-proxy-agent: 5.0.1(supports-color@10.2.2) proxy-from-env: 2.1.0 @@ -38694,16 +37498,6 @@ snapshots: - debug - supports-color - axios@1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0): - dependencies: - follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) - form-data: 4.0.6 - https-proxy-agent: 5.0.1(supports-color@7.2.0) - proxy-from-env: 2.1.0 - transitivePeerDependencies: - - debug - - supports-color - b4a@1.6.7: {} babel-dead-code-elimination@1.0.12(supports-color@10.2.2): @@ -38719,7 +37513,7 @@ snapshots: dependencies: '@babel/core': 7.28.5(supports-color@10.2.2) find-up: 5.0.0 - webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) babel-plugin-jsx-dom-expressions@0.40.3(@babel/core@7.28.5(supports-color@10.2.2)): dependencies: @@ -38739,15 +37533,6 @@ snapshots: html-entities: 2.3.3 parse5: 7.3.0 - babel-plugin-jsx-dom-expressions@0.40.3(@babel/core@7.29.7(supports-color@7.2.0)): - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0)) - '@babel/types': 7.29.8 - html-entities: 2.3.3 - parse5: 7.3.0 - babel-plugin-macros@3.1.0: dependencies: '@babel/runtime': 7.26.7 @@ -38779,13 +37564,6 @@ snapshots: optionalDependencies: solid-js: 1.9.12 - babel-preset-solid@1.9.10(@babel/core@7.29.7(supports-color@7.2.0))(solid-js@1.9.12): - dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.29.7(supports-color@7.2.0)) - optionalDependencies: - solid-js: 1.9.12 - balanced-match@1.0.2: {} balanced-match@4.0.3: {} @@ -38836,14 +37614,14 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): + better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/drizzle-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) '@better-auth/kysely-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(kysely@0.29.2) '@better-auth/memory-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) '@better-auth/mongo-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) - '@better-auth/prisma-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + '@better-auth/prisma-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@better-auth/telemetry': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1) '@better-auth/utils': 0.4.2 '@better-fetch/fetch': 1.3.1 @@ -38856,15 +37634,15 @@ snapshots: nanostores: 1.3.0 zod: 4.5.4 optionalDependencies: - '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)) '@tanstack/solid-start': link:packages/solid-start mysql2: 3.15.3 - next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) - prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1) + prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) solid-js: 1.9.12 - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - '@cloudflare/workers-types' @@ -38887,6 +37665,8 @@ snapshots: dependencies: require-from-string: 2.0.2 + big.js@5.2.2: {} + binary-extensions@2.3.0: {} bindings@1.5.0: @@ -38950,6 +37730,10 @@ snapshots: dependencies: balanced-match: 1.0.2 + brace-expansion@5.0.12: + dependencies: + balanced-match: 4.0.4 + brace-expansion@5.0.9: dependencies: balanced-match: 4.0.4 @@ -39017,22 +37801,7 @@ snapshots: pkg-types: 2.3.0 rc9: 2.1.2 - c12@3.3.4(magicast@0.5.4): - dependencies: - chokidar: 5.0.0 - confbox: 0.2.4 - defu: 6.1.7 - dotenv: 17.4.2 - exsolve: 1.1.1 - giget: 3.3.1 - jiti: 2.7.0 - ohash: 2.0.11 - pathe: 2.0.3 - perfect-debounce: 2.1.0 - pkg-types: 2.3.0 - rc9: 3.1.0 - optionalDependencies: - magicast: 0.5.4 + cac@7.1.0: {} call-bind-apply-helpers@1.0.2: dependencies: @@ -39064,12 +37833,25 @@ snapshots: caniuse-lite@1.0.30001760: {} - chai@6.2.2: {} + cf@1.0.0-beta.28(@types/node@25.0.9): + dependencies: + '@cloudflare/build-output-utils': 0.9.10 + '@cloudflare/config': 0.30.2 + '@cloudflare/runtime-types': 0.1.23(@types/node@25.0.9) + blake3-wasm: 2.1.5 + miniflare: 5.20261104.0-beta(@types/node@25.0.9) + transitivePeerDependencies: + - '@types/node' + - bufferutil + - utf-8-validate + + chai@6.3.0: {} chalk@3.0.0: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 + optional: true chalk@4.1.2: dependencies: @@ -39197,12 +37979,6 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - cliui@9.0.1: - dependencies: - string-width: 7.2.0 - strip-ansi: 7.2.0 - wrap-ansi: 9.0.2 - clone-deep@4.0.1: dependencies: is-plain-object: 2.0.4 @@ -39213,7 +37989,8 @@ snapshots: clsx@2.1.1: {} - cluster-key-slot@1.1.1: {} + cluster-key-slot@1.1.1: + optional: true color-convert@2.0.1: dependencies: @@ -39240,6 +38017,8 @@ snapshots: colorette@2.0.20: {} + colorjs.io@0.7.1: {} + combinate@1.1.11: {} combined-stream@1.0.8: @@ -39270,20 +38049,8 @@ snapshots: common-tags@1.8.2: {} - commondir@1.0.1: {} - compare-versions@6.1.1: {} - compatx@0.2.0: {} - - compress-commons@6.0.2: - dependencies: - crc-32: 1.2.2 - crc32-stream: 6.0.0 - is-stream: 2.0.1 - normalize-path: 3.0.0 - readable-stream: 4.7.0 - compress-commons@7.0.1: dependencies: crc-32: 1.2.2 @@ -39349,10 +38116,6 @@ snapshots: confbox@0.2.2: {} - confbox@0.2.4: {} - - confbox@0.3.1: {} - config-chain@1.1.13: dependencies: ini: 1.3.8 @@ -39378,48 +38141,46 @@ snapshots: convert-source-map@2.0.0: {} - convex-helpers@0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(zod@3.25.76): + convex-helpers@0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9))(hono@4.13.9)(react@19.2.9)(zod@3.25.76): dependencies: - convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) + convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9) optionalDependencies: '@standard-schema/spec': 1.1.0 - hono: 4.7.10 - react: 19.2.3 + hono: 4.13.9 + react: 19.2.9 typescript: '@typescript/typescript6@6.0.2' zod: 3.25.76 - convex-solidjs@0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.12): + convex-solidjs@0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9)(solid-js@1.9.12): dependencies: '@solid-primitives/context': 0.3.2(solid-js@1.9.12) - convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) + convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9) solid-js: 1.9.12 transitivePeerDependencies: - '@auth0/auth0-react' - '@clerk/clerk-react' - react - convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: esbuild: 0.23.0 jwt-decode: 3.1.2 prettier: 3.4.2 optionalDependencies: - '@clerk/clerk-react': 5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@clerk/clerk-react': 5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) - convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3): + convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9))(react@19.2.9): dependencies: esbuild: 0.25.4 prettier: 3.8.1 optionalDependencies: - '@clerk/clerk-react': 5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 + '@clerk/clerk-react': 5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 cookie-es@1.2.3: {} - cookie-es@2.0.1: {} - cookie-es@3.1.1: {} cookie-signature@1.0.6: {} @@ -39460,11 +38221,6 @@ snapshots: crc-32@1.2.2: {} - crc32-stream@6.0.0: - dependencies: - crc-32: 1.2.2 - readable-stream: 4.7.0 - crc32-stream@7.0.1: dependencies: crc-32: 1.2.2 @@ -39474,8 +38230,6 @@ snapshots: dependencies: luxon: 3.7.2 - croner@10.0.1: {} - cross-argv@2.0.0: {} cross-env@10.0.0: @@ -39493,21 +38247,9 @@ snapshots: dependencies: uncrypto: 0.1.3 - crossws@0.4.12(srvx@0.11.22): + crossws@0.4.12(srvx@1.0.5): optionalDependencies: - srvx: 0.11.22 - - crossws@0.4.3(srvx@0.10.1): - optionalDependencies: - srvx: 0.10.1 - - crossws@0.4.4(srvx@0.11.22): - optionalDependencies: - srvx: 0.11.22 - - crossws@0.4.5(srvx@0.11.22): - optionalDependencies: - srvx: 0.11.22 + srvx: 1.0.5 css-loader@7.1.2(webpack@5.97.1): dependencies: @@ -39520,7 +38262,7 @@ snapshots: postcss-value-parser: 4.2.0 semver: 7.7.3 optionalDependencies: - webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) css-select@4.3.0: dependencies: @@ -39541,7 +38283,7 @@ snapshots: css-tree@2.2.1: dependencies: mdn-data: 2.0.28 - source-map-js: 1.2.1 + source-map-js: 1.2.2 css-tree@3.2.1: dependencies: @@ -39600,17 +38342,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 - db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3): - optionalDependencies: - '@electric-sql/pglite': 0.3.16 - '@libsql/client': 0.15.15 - mysql2: 3.15.3 - - db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3): - optionalDependencies: - '@electric-sql/pglite': 0.3.2 - '@libsql/client': 0.15.15 - mysql2: 3.15.3 + db0@0.4.1: {} de-indent@1.0.2: {} @@ -39626,12 +38358,6 @@ snapshots: optionalDependencies: supports-color: 10.2.2 - debug@4.4.3(supports-color@7.2.0): - dependencies: - ms: 2.1.3 - optionalDependencies: - supports-color: 7.2.0 - decache@4.6.2: dependencies: callsite: 1.0.0 @@ -39673,8 +38399,6 @@ snapshots: deepmerge@4.3.1: {} - default-browser-id@5.0.0: {} - default-browser-id@5.0.1: {} default-browser@5.2.1: @@ -39682,11 +38406,6 @@ snapshots: bundle-name: 4.1.0 default-browser-id: 5.0.1 - default-browser@5.5.0: - dependencies: - bundle-name: 4.1.0 - default-browser-id: 5.0.0 - defaults@1.0.4: dependencies: clone: 1.0.4 @@ -39754,11 +38473,11 @@ snapshots: dependencies: node-source-walk: 7.0.1 - detective-postcss@7.0.1(postcss@8.5.23): + detective-postcss@7.0.1(postcss@8.5.29): dependencies: is-url: 1.2.4 - postcss: 8.5.23 - postcss-values-parser: 6.0.2(postcss@8.5.23) + postcss: 8.5.29 + postcss-values-parser: 6.0.2(postcss@8.5.29) detective-sass@6.0.1: dependencies: @@ -39798,7 +38517,7 @@ snapshots: dexie@4.2.1: {} - diff@8.0.4: {} + diff@9.0.0: {} dir-glob@3.0.1: dependencies: @@ -39860,10 +38579,6 @@ snapshots: no-case: 3.0.4 tslib: 2.8.1 - dot-prop@10.1.0: - dependencies: - type-fest: 5.4.1 - dot-prop@9.0.0: dependencies: type-fest: 4.41.0 @@ -39878,8 +38593,6 @@ snapshots: dotenv@17.2.3: {} - dotenv@17.4.2: {} - dotenv@8.6.0: {} dunder-proto@1.0.1: @@ -39888,8 +38601,6 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 - duplexer@0.1.2: {} - eastasianwidth@0.2.0: {} ecdsa-sig-formatter@1.0.11: @@ -39916,14 +38627,14 @@ snapshots: electron-to-chromium@1.5.90: {} - emoji-regex@10.6.0: {} - emoji-regex@8.0.0: {} emoji-regex@9.2.2: {} emojilib@2.4.0: {} + emojis-list@3.0.0: {} + empathic@2.0.0: {} enabled@2.0.0: {} @@ -39978,13 +38689,12 @@ snapshots: env-paths@3.0.0: {} - env-runner@0.1.6(miniflare@4.20260317.0): + env-runner@0.2.3: dependencies: - crossws: 0.4.5(srvx@0.11.22) - httpxy: 0.3.1 - srvx: 0.11.22 - optionalDependencies: - miniflare: 4.20260317.0 + crossws: 0.4.12(srvx@1.0.5) + exsolve: 1.1.1 + httpxy: 0.5.5 + srvx: 1.0.5 envinfo@7.14.0: {} @@ -40016,13 +38726,11 @@ snapshots: es-module-lexer@1.7.0: {} - es-module-lexer@2.3.1: {} + es-module-lexer@2.3.2: {} - es-module-lexer@3.0.2: {} + es-module-lexer@3.0.3: {} - es-object-atoms@1.1.1: - dependencies: - es-errors: 1.3.0 + es-module-lexer@3.0.4: {} es-object-atoms@1.1.2: dependencies: @@ -40035,11 +38743,11 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.4 - esbuild-plugin-solid@0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@7.2.0): + esbuild-plugin-solid@0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@10.2.2): dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) - '@babel/preset-typescript': 7.27.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@7.2.0))(solid-js@1.9.12) + '@babel/core': 7.29.7(supports-color@10.2.2) + '@babel/preset-typescript': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) + babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@10.2.2))(solid-js@1.9.12) esbuild: 0.27.4 solid-js: 1.9.12 transitivePeerDependencies: @@ -40224,35 +38932,6 @@ snapshots: '@esbuild/win32-ia32': 0.28.1 '@esbuild/win32-x64': 0.28.1 - esbuild@0.28.2: - optionalDependencies: - '@esbuild/aix-ppc64': 0.28.2 - '@esbuild/android-arm': 0.28.2 - '@esbuild/android-arm64': 0.28.2 - '@esbuild/android-x64': 0.28.2 - '@esbuild/darwin-arm64': 0.28.2 - '@esbuild/darwin-x64': 0.28.2 - '@esbuild/freebsd-arm64': 0.28.2 - '@esbuild/freebsd-x64': 0.28.2 - '@esbuild/linux-arm': 0.28.2 - '@esbuild/linux-arm64': 0.28.2 - '@esbuild/linux-ia32': 0.28.2 - '@esbuild/linux-loong64': 0.28.2 - '@esbuild/linux-mips64el': 0.28.2 - '@esbuild/linux-ppc64': 0.28.2 - '@esbuild/linux-riscv64': 0.28.2 - '@esbuild/linux-s390x': 0.28.2 - '@esbuild/linux-x64': 0.28.2 - '@esbuild/netbsd-arm64': 0.28.2 - '@esbuild/netbsd-x64': 0.28.2 - '@esbuild/openbsd-arm64': 0.28.2 - '@esbuild/openbsd-x64': 0.28.2 - '@esbuild/openharmony-arm64': 0.28.2 - '@esbuild/sunos-x64': 0.28.2 - '@esbuild/win32-arm64': 0.28.2 - '@esbuild/win32-ia32': 0.28.2 - '@esbuild/win32-x64': 0.28.2 - escalade@3.2.0: {} escape-html@1.0.3: {} @@ -40276,11 +38955,6 @@ snapshots: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) semver: 7.8.5 - eslint-compat-utils@0.5.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)): - dependencies: - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - semver: 7.8.5 - eslint-import-context@0.1.9(unrs-resolver@1.11.1): dependencies: get-tsconfig: 4.10.1 @@ -40295,14 +38969,7 @@ snapshots: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-compat-utils: 0.5.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) - eslint-plugin-es-x@7.8.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)): - dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - '@eslint-community/regexpp': 4.12.1 - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-compat-utils: 0.5.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - - eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): + eslint-plugin-import-x@4.16.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): dependencies: '@typescript-eslint/types': 8.53.0 comment-parser: 1.4.1 @@ -40311,28 +38978,9 @@ snapshots: eslint-import-context: 0.1.9(unrs-resolver@1.11.1) is-glob: 4.0.3 minimatch: 10.2.5 - semver: 7.8.2 + semver: 7.8.5 stable-hash-x: 0.2.0 unrs-resolver: 1.11.1 - optionalDependencies: - '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) - transitivePeerDependencies: - - supports-color - - eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0): - dependencies: - '@typescript-eslint/types': 8.53.0 - comment-parser: 1.4.1 - debug: 4.4.3(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-import-context: 0.1.9(unrs-resolver@1.11.1) - is-glob: 4.0.3 - minimatch: 10.2.5 - semver: 7.8.2 - stable-hash-x: 0.2.0 - unrs-resolver: 1.11.1 - optionalDependencies: - '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) transitivePeerDependencies: - supports-color @@ -40346,22 +38994,22 @@ snapshots: globals: 15.14.0 globrex: 0.1.2 ignore: 5.3.2 - semver: 7.8.2 + semver: 7.8.5 ts-declaration-location: 1.0.7(@typescript/typescript6@6.0.2) transitivePeerDependencies: - typescript - eslint-plugin-n@17.24.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)): + eslint-plugin-n@17.24.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)): dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) + '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) enhanced-resolve: 5.18.3 - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - eslint-plugin-es-x: 7.8.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) + eslint-plugin-es-x: 7.8.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) get-tsconfig: 4.10.1 globals: 15.14.0 globrex: 0.1.2 ignore: 5.3.2 - semver: 7.8.2 + semver: 7.8.5 ts-declaration-location: 1.0.7(@typescript/typescript6@6.0.2) transitivePeerDependencies: - typescript @@ -40504,11 +39152,9 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)): + eslint-plugin-unused-imports@4.1.4(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)): dependencies: - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-plugin-vue@9.33.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): dependencies: @@ -40587,48 +39233,6 @@ snapshots: transitivePeerDependencies: - supports-color - eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0): - dependencies: - '@eslint-community/eslint-utils': 4.9.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)) - '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.19.2(supports-color@7.2.0) - '@eslint/config-helpers': 0.1.0 - '@eslint/core': 0.12.0 - '@eslint/eslintrc': 3.3.0(supports-color@7.2.0) - '@eslint/js': 9.22.0 - '@eslint/plugin-kit': 0.2.7 - '@humanfs/node': 0.16.6 - '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.4.2 - '@types/estree': 1.0.8 - '@types/json-schema': 7.0.15 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.6 - debug: 4.4.3(supports-color@7.2.0) - escape-string-regexp: 4.0.0 - eslint-scope: 8.3.0 - eslint-visitor-keys: 4.2.1 - espree: 10.4.0 - esquery: 1.6.0 - esutils: 2.0.3 - fast-deep-equal: 3.1.3 - file-entry-cache: 8.0.0 - find-up: 5.0.0 - glob-parent: 6.0.2 - ignore: 5.3.2 - imurmurhash: 0.1.4 - is-glob: 4.0.3 - json-stable-stringify-without-jsonify: 1.0.1 - lodash.merge: 4.6.2 - minimatch: 3.1.2 - natural-compare: 1.4.0 - optionator: 0.9.4 - optionalDependencies: - jiti: 2.7.0 - transitivePeerDependencies: - - supports-color - espree@10.4.0: dependencies: acorn: 8.15.0 @@ -40659,7 +39263,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 esutils@2.0.3: {} @@ -40689,7 +39293,7 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - expect-type@1.3.0: {} + expect-type@1.4.0: {} express@4.22.2(supports-color@10.2.2): dependencies: @@ -40762,6 +39366,8 @@ snapshots: exsolve@1.1.1: {} + exsolve@1.2.0: {} + extendable-error@0.1.7: {} fast-check@3.23.2: @@ -40788,7 +39394,7 @@ snapshots: dependencies: '@fastify/merge-json-schemas': 0.2.1 ajv: 8.17.1 - ajv-formats: 3.0.1(ajv@8.17.1) + ajv-formats: 3.0.1 fast-uri: 3.0.6 json-schema-ref-resolver: 3.0.0 rfdc: 1.4.1 @@ -40832,7 +39438,7 @@ snapshots: process-warning: 5.0.0 rfdc: 1.4.1 secure-json-parse: 4.1.0 - semver: 7.8.2 + semver: 7.8.5 toad-cache: 3.7.0 fastq@1.19.0: @@ -40858,7 +39464,7 @@ snapshots: node-domexception: 1.0.0 web-streams-polyfill: 3.3.3 - fetchdts@0.1.7: {} + fetchdts@0.2.0: {} fflate@0.8.3: {} @@ -40925,11 +39531,6 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 - find-up@6.3.0: - dependencies: - locate-path: 7.2.0 - path-exists: 5.0.0 - find-up@7.0.0: dependencies: locate-path: 7.2.0 @@ -40978,16 +39579,14 @@ snapshots: flatted@3.4.2: {} + flatted@3.4.4: {} + fn.name@1.1.0: {} follow-redirects@1.16.0(debug@4.4.3(supports-color@10.2.2)): optionalDependencies: debug: 4.4.3(supports-color@10.2.2) - follow-redirects@1.16.0(debug@4.4.3(supports-color@7.2.0)): - optionalDependencies: - debug: 4.4.3(supports-color@7.2.0) - for-each@0.3.5: dependencies: is-callable: 1.2.7 @@ -41019,15 +39618,15 @@ snapshots: forwarded@0.2.0: {} - framer-motion@11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + framer-motion@11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: motion-dom: 11.18.1 motion-utils: 11.18.1 tslib: 2.8.1 optionalDependencies: '@emotion/is-prop-valid': 1.3.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) fresh@0.5.2: {} @@ -41067,8 +39666,6 @@ snapshots: get-caller-file@2.0.5: {} - get-east-asian-width@1.6.0: {} - get-intrinsic@1.3.0: dependencies: call-bind-apply-helpers: 1.0.2 @@ -41110,8 +39707,6 @@ snapshots: nypm: 0.6.0 pathe: 2.0.3 - giget@3.3.1: {} - gl-matrix@3.4.4: {} glob-parent@5.1.2: @@ -41160,16 +39755,6 @@ snapshots: merge2: 1.4.1 slash: 3.0.0 - globby@16.2.4: - dependencies: - '@sindresorhus/merge-streams': 4.0.0 - fast-glob: 3.3.3 - ignore: 7.0.5 - is-path-inside: 4.0.0 - micromatch: 4.0.8 - slash: 5.1.0 - unicorn-magic: 0.4.0 - globrex@0.1.2: {} gonzales-pe@4.3.0: @@ -41196,10 +39781,6 @@ snapshots: graphql@16.14.2: {} - gzip-size@7.0.0: - dependencies: - duplexer: 0.1.2 - h3@1.15.11: dependencies: cookie-es: 1.2.3 @@ -41212,26 +39793,13 @@ snapshots: ufo: 1.6.4 uncrypto: 0.1.3 - h3@2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)): + h3@2.0.1-rc.32(crossws@0.4.12(srvx@1.0.5))(ocache@0.3.0): dependencies: - rou3: 0.7.12 - srvx: 0.11.22 + rou3: 0.9.2 + srvx: 1.0.5 optionalDependencies: - crossws: 0.4.3(srvx@0.10.1) - - h3@2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)): - dependencies: - rou3: 0.8.1 - srvx: 0.11.22 - optionalDependencies: - crossws: 0.4.4(srvx@0.11.22) - - h3@2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)): - dependencies: - rou3: 0.8.1 - srvx: 0.11.22 - optionalDependencies: - crossws: 0.4.12(srvx@0.11.22) + crossws: 0.4.12(srvx@1.0.5) + ocache: 0.3.0 handle-thing@2.0.1: {} @@ -41286,11 +39854,17 @@ snapshots: dependencies: react-is: 16.13.1 + hono-sessions@0.8.1(hono@4.13.9): + dependencies: + hono: 4.13.9 + iron-webcrypto: 1.2.1 + ohash: 2.0.11 + + hono@4.13.9: {} + hono@4.7.10: {} - hookable@5.5.3: {} - - hookable@6.1.0: {} + hookable@6.1.2: {} hosted-git-info@7.0.2: dependencies: @@ -41393,10 +39967,10 @@ snapshots: transitivePeerDependencies: - supports-color - http-proxy-middleware@2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@7.2.0)): + http-proxy-middleware@2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@10.2.2)): dependencies: '@types/http-proxy': 1.17.15 - http-proxy: 1.18.1(debug@4.4.3(supports-color@7.2.0)) + http-proxy: 1.18.1(debug@4.4.3(supports-color@10.2.2)) is-glob: 4.0.3 is-plain-obj: 3.0.0 micromatch: 4.0.8 @@ -41424,14 +39998,6 @@ snapshots: transitivePeerDependencies: - debug - http-proxy@1.18.1(debug@4.4.3(supports-color@7.2.0)): - dependencies: - eventemitter3: 4.0.7 - follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) - requires-port: 1.0.0 - transitivePeerDependencies: - - debug - http-shutdown@1.2.2: {} http-status-codes@2.3.0: {} @@ -41443,13 +40009,6 @@ snapshots: transitivePeerDependencies: - supports-color - https-proxy-agent@5.0.1(supports-color@7.2.0): - dependencies: - agent-base: 6.0.2(supports-color@7.2.0) - debug: 4.4.3(supports-color@7.2.0) - transitivePeerDependencies: - - supports-color - https-proxy-agent@7.0.6(supports-color@10.2.2): dependencies: agent-base: 7.1.3 @@ -41457,8 +40016,6 @@ snapshots: transitivePeerDependencies: - supports-color - httpxy@0.3.1: {} - httpxy@0.5.5: {} human-id@4.1.1: {} @@ -41495,17 +40052,18 @@ snapshots: ignore@5.3.2: {} + ignore@7.0.12: {} + ignore@7.0.5: {} image-meta@0.2.2: {} - image-size@2.0.2: - optional: true - immer@10.1.1: {} immutable@5.1.4: {} + immutable@5.1.9: {} + import-fresh@3.3.0: dependencies: parent-module: 1.0.1 @@ -41514,7 +40072,7 @@ snapshots: import-in-the-middle@3.5.1: dependencies: cjs-module-lexer: 2.2.1 - es-module-lexer: 3.0.2 + es-module-lexer: 3.0.3 module-details-from-path: 1.0.4 import-lazy@4.0.0: {} @@ -41559,12 +40117,13 @@ snapshots: standard-as-callback: 2.1.0 transitivePeerDependencies: - supports-color + optional: true ipaddr.js@1.9.1: {} ipaddr.js@2.2.0: {} - ipx@3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + ipx@3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(srvx@1.0.5): dependencies: '@fastify/accept-negotiator': 2.0.1 citty: 0.1.6 @@ -41574,13 +40133,13 @@ snapshots: etag: 1.8.1 h3: 1.15.11 image-meta: 0.2.2 - listhen: 1.10.1(srvx@0.11.22) + listhen: 1.10.1(srvx@1.0.5) ofetch: 1.5.1 pathe: 2.0.3 sharp: 0.34.5 svgo: 4.0.0 ufo: 1.6.4 - unstorage: 1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + unstorage: 1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)) xss: 1.0.15 transitivePeerDependencies: - '@azure/app-configuration' @@ -41677,8 +40236,6 @@ snapshots: transitivePeerDependencies: - supports-color - is-in-ssh@1.0.0: {} - is-inside-container@1.0.0: dependencies: is-docker: 3.0.0 @@ -41687,8 +40244,6 @@ snapshots: is-map@2.0.3: {} - is-module@1.0.0: {} - is-network-error@1.1.0: {} is-node-process@1.2.0: {} @@ -41720,10 +40275,6 @@ snapshots: is-property@1.0.2: {} - is-reference@1.2.1: - dependencies: - '@types/estree': 1.0.8 - is-regex@1.2.1: dependencies: call-bound: 1.0.4 @@ -41781,10 +40332,6 @@ snapshots: dependencies: is-inside-container: 1.0.0 - is-wsl@3.1.1: - dependencies: - is-inside-container: 1.0.0 - isarray@1.0.0: {} isarray@2.0.5: {} @@ -41817,9 +40364,6 @@ snapshots: jose@6.1.3: {} - jpeg-js@0.4.4: - optional: true - js-base64@3.7.8: {} js-beautify@1.15.4: @@ -41832,19 +40376,12 @@ snapshots: js-cookie@3.0.5: {} - js-image-generator@1.0.4: - dependencies: - jpeg-js: 0.4.4 - optional: true - js-sha256@0.11.1: {} js-tokens@10.0.0: {} js-tokens@4.0.0: {} - js-tokens@9.0.1: {} - js-yaml@3.14.1: dependencies: argparse: 1.0.10 @@ -42005,10 +40542,6 @@ snapshots: kleur@4.1.5: {} - klona@2.0.6: {} - - knitwork@1.3.0: {} - known-css-properties@0.30.0: {} kolorist@1.8.0: {} @@ -42073,7 +40606,7 @@ snapshots: light-my-request@6.6.0: dependencies: - cookie: 1.0.2 + cookie: 1.1.1 process-warning: 4.0.1 set-cookie-parser: 2.7.2 @@ -42181,12 +40714,12 @@ snapshots: lines-and-columns@2.0.3: {} - listhen@1.10.1(srvx@0.11.22): + listhen@1.10.1(srvx@1.0.5): dependencies: '@parcel/watcher-wasm': 2.6.0 citty: 0.2.2 consola: 3.4.2 - crossws: 0.4.12(srvx@0.11.22) + crossws: 0.4.12(srvx@1.0.5) defu: 6.1.7 get-port-please: 3.2.0 h3: 1.15.11 @@ -42204,17 +40737,17 @@ snapshots: loader-runner@4.3.0: {} + loader-utils@2.0.4: + dependencies: + big.js: 5.2.2 + emojis-list: 3.0.0 + json5: 2.2.3 + local-pkg@0.5.1: dependencies: mlly: 1.8.0 pkg-types: 1.3.1 - local-pkg@1.2.1: - dependencies: - mlly: 1.8.0 - pkg-types: 2.3.0 - quansync: 0.2.11 - locate-path@5.0.0: dependencies: p-locate: 4.1.0 @@ -42305,17 +40838,15 @@ snapshots: magic-string@0.30.8: dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 - magic-string@1.2.3: + magic-string@1.4.3: dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 - magicast@0.5.4: + magic-string@1.4.5: dependencies: - '@babel/parser': 7.29.8 - '@babel/types': 7.29.8 - source-map-js: 1.2.1 + '@jridgewell/sourcemap-codec': 1.6.0 manage-path@2.0.0: {} @@ -42399,8 +40930,6 @@ snapshots: mime@1.6.0: {} - mime@4.1.0: {} - mimic-fn@2.1.0: {} mimic-fn@4.0.0: {} @@ -42419,6 +40948,19 @@ snapshots: - bufferutil - utf-8-validate + miniflare@5.20261104.0-beta(@types/node@25.0.9): + dependencies: + '@cspotcode/source-map-support': 0.8.1 + sharp: 0.35.5(@types/node@25.0.9) + undici: 7.30.1 + workerd: 1.20261104.1 + ws: 8.21.0 + youch: 4.1.0-beta.10 + transitivePeerDependencies: + - '@types/node' + - bufferutil + - utf-8-validate + minimalistic-assert@1.0.1: {} minimatch@10.2.5: @@ -42433,10 +40975,6 @@ snapshots: dependencies: brace-expansion: 1.1.15 - minimatch@5.1.9: - dependencies: - brace-expansion: 2.1.1 - minimatch@9.0.1: dependencies: brace-expansion: 2.1.1 @@ -42447,22 +40985,22 @@ snapshots: minimist@1.2.8: {} - minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3): + minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 schema-utils: 4.3.3 terser: 5.51.2 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) clean-css: 5.3.3 csso: 5.0.5 - esbuild: 0.28.2 + esbuild: 0.28.1 html-minifier-terser: 6.1.0 lightningcss: 1.33.0 - postcss: 8.5.23 - sharp: 0.35.4(@types/node@25.0.9) + postcss: 8.5.29 + sharp: 0.35.5(@types/node@25.0.9) svgo: 4.0.0 minipass@7.1.2: {} @@ -42485,13 +41023,6 @@ snapshots: pkg-types: 1.3.1 ufo: 1.6.4 - mlly@1.8.2: - dependencies: - acorn: 8.18.0 - pathe: 2.0.3 - pkg-types: 1.3.1 - ufo: 1.6.4 - module-definition@6.0.1: dependencies: ast-module-types: 6.0.1 @@ -42624,10 +41155,10 @@ snapshots: nanoid@3.3.11: {} - nanoid@3.3.12: {} - nanoid@3.3.18: {} + nanoid@3.3.19: {} + nanostores@1.3.0: {} napi-postinstall@0.3.3: {} @@ -42644,16 +41175,46 @@ snapshots: netlify-redirector@0.5.0: {} - next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): + next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.105.1): dependencies: '@next/env': 16.3.4 '@swc/helpers': 0.5.23 baseline-browser-mapping: 2.11.23 caniuse-lite: 1.0.30001760 postcss: 8.5.23 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.9) + optionalDependencies: + '@next/swc-darwin-arm64': 16.3.4 + '@next/swc-darwin-x64': 16.3.4 + '@next/swc-linux-arm64-gnu': 16.3.4 + '@next/swc-linux-arm64-musl': 16.3.4 + '@next/swc-linux-x64-gnu': 16.3.4 + '@next/swc-linux-x64-musl': 16.3.4 + '@next/swc-win32-arm64-msvc': 16.3.4 + '@next/swc-win32-x64-msvc': 16.3.4 + '@opentelemetry/api': 1.9.1 + '@playwright/test': 1.63.0 + babel-plugin-react-compiler: 1.0.0 + sass: 1.105.1 + sharp: 0.35.4(@types/node@25.0.9) + transitivePeerDependencies: + - '@babel/core' + - '@types/node' + - babel-plugin-macros + optional: true + + next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.9(react@19.2.9))(react@19.2.9)(sass@1.97.2): + dependencies: + '@next/env': 16.3.4 + '@swc/helpers': 0.5.23 + baseline-browser-mapping: 2.11.23 + caniuse-lite: 1.0.30001760 + postcss: 8.5.23 + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.9) optionalDependencies: '@next/swc-darwin-arm64': 16.3.4 '@next/swc-darwin-x64': 16.3.4 @@ -42673,333 +41234,23 @@ snapshots: - '@types/node' - babel-plugin-macros - nf3@0.3.11: {} + nf3@0.3.24: {} - nf3@0.3.6: {} - - nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + nitro@3.0.260903-beta: dependencies: consola: 3.4.2 - crossws: 0.4.3(srvx@0.10.1) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - h3: 2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)) - jiti: 2.6.1 - nf3: 0.3.6 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - oxc-minify: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - oxc-transform: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - srvx: 0.10.1 - undici: 7.24.4 + crossws: 0.4.12(srvx@1.0.5) + db0: 0.4.1 + env-runner: 0.2.3 + h3: 2.0.1-rc.32(crossws@0.4.12(srvx@1.0.5))(ocache@0.3.0) + hookable: 6.1.2 + nf3: 0.3.24 + ocache: 0.3.0 + rolldown: 1.2.13 + rou3: 0.9.2 + srvx: 1.0.5 unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - rolldown: 1.0.2 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 2.0.0 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 3.3.1 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 2.0.0 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): - dependencies: - '@cloudflare/kv-asset-handler': 0.4.2 - '@rollup/plugin-alias': 6.0.0(rollup@4.63.1) - '@rollup/plugin-commonjs': 29.0.3(rollup@4.63.1) - '@rollup/plugin-inject': 5.0.5(rollup@4.63.1) - '@rollup/plugin-json': 6.1.0(rollup@4.63.1) - '@rollup/plugin-node-resolve': 16.0.3(rollup@4.63.1) - '@rollup/plugin-replace': 6.0.3(rollup@4.63.1) - '@rollup/plugin-terser': 1.0.0(rollup@4.63.1) - '@vercel/nft': 1.11.0(rollup@4.63.1)(supports-color@10.2.2) - archiver: 7.0.1 - c12: 3.3.4(magicast@0.5.4) - chokidar: 5.0.0 - citty: 0.2.2 - compatx: 0.2.0 - confbox: 0.2.4 - consola: 3.4.2 - cookie-es: 2.0.1 - croner: 10.0.1 - crossws: 0.3.5 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - defu: 6.1.7 - destr: 2.0.5 - dot-prop: 10.1.0 - esbuild: 0.28.2 - escape-string-regexp: 5.0.0 - etag: 1.8.1 - exsolve: 1.1.1 - globby: 16.2.4 - gzip-size: 7.0.0 - h3: 1.15.11 - hookable: 5.5.3 - httpxy: 0.5.5 - ioredis: 5.11.1(supports-color@10.2.2) - jiti: 2.7.0 - klona: 2.0.6 - knitwork: 1.3.0 - listhen: 1.10.1(srvx@0.11.22) - magic-string: 0.30.21 - magicast: 0.5.4 - mime: 4.1.0 - mlly: 1.8.2 - node-fetch-native: 1.6.7 - node-mock-http: 1.0.4 - ofetch: 1.5.1 - ohash: 2.0.11 - pathe: 2.0.3 - perfect-debounce: 2.1.0 - pkg-types: 2.3.3 - pretty-bytes: 7.1.0 - radix3: 1.1.2 - rollup: 4.63.1 - rollup-plugin-visualizer: 7.1.1(rolldown@1.0.2)(rollup@4.63.1) - scule: 1.3.0 - semver: 7.8.2 - serve-placeholder: 2.0.2 - serve-static: 2.2.1(supports-color@10.2.2) - source-map: 0.7.6 - std-env: 4.1.0 - ufo: 1.6.4 - ultrahtml: 1.6.0 - uncrypto: 0.1.3 - unctx: 2.5.0 - unenv: 2.0.0-rc.24 - unimport: 6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) - unplugin-utils: 0.3.1 - unstorage: 1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) - untyped: 2.0.0 - unwasm: 0.5.3 - youch: 4.1.1 - youch-core: 0.3.3 - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@farmfe/core' - - '@libsql/client' - - '@netlify/blobs' - - '@parcel/watcher' - - '@planetscale/database' - - '@rspack/core' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - bare-abort-controller - - bare-buffer - - better-sqlite3 - - bun-types-no-globals - - drizzle-orm - - encoding - - idb-keyval - - mysql2 - - oxc-parser - - rolldown - - sqlite3 - - srvx - - supports-color - - unloader - - uploadthing - - vite - - webpack + unstorage: 2.0.0-alpha.10 no-case@3.0.4: dependencies: @@ -43090,7 +41341,7 @@ snapshots: nwsapi@2.2.16: {} - nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)): + nx@24.0.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2))(@swc/core@1.15.33(@swc/helpers@0.5.23)): dependencies: '@clack/core': 1.4.3 '@clack/prompts': 1.7.0 @@ -43102,19 +41353,14 @@ snapshots: '@tybys/wasm-util': 0.9.0 '@yarnpkg/lockfile': 1.1.0 '@zkochan/js-yaml': 0.0.7 - agent-base: 6.0.2(supports-color@7.2.0) ansi-regex: 5.0.1 ansi-styles: 4.3.0 argparse: 2.0.1 - asynckit: 0.4.0 - axios: 1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0) balanced-match: 4.0.3 base64-js: 1.5.1 bl: 4.1.0 - brace-expansion: 5.0.9 + brace-expansion: 5.0.12 buffer: 5.7.1 - bundle-name: 4.1.0 - call-bind-apply-helpers: 1.0.2 chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 @@ -43122,82 +41368,50 @@ snapshots: clone: 1.0.4 color-convert: 2.0.1 color-name: 1.1.4 - combined-stream: 1.0.8 - debug: 4.4.3(supports-color@7.2.0) - default-browser: 5.2.1 - default-browser-id: 5.0.0 defaults: 1.0.4 - define-lazy-prop: 3.0.0 - delayed-stream: 1.0.0 dotenv: 16.4.7 dotenv-expand: 12.0.3 - dunder-proto: 1.0.1 ejs: 5.0.1 emoji-regex: 8.0.0 end-of-stream: 1.4.5 - es-define-property: 1.0.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - es-set-tostringtag: 2.1.0 escalade: 3.2.0 escape-string-regexp: 1.0.5 fast-string-truncated-width: 3.0.3 fast-string-width: 3.0.2 fast-wrap-ansi: 0.2.0 figures: 3.2.0 - flat: 5.0.2 - follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) - form-data: 4.0.6 fs-constants: 1.0.0 - function-bind: 1.1.2 get-caller-file: 2.0.5 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 - gopd: 1.2.0 has-flag: 4.0.0 - has-symbols: 1.1.0 - has-tostringtag: 1.0.2 - hasown: 2.0.4 - https-proxy-agent: 5.0.1(supports-color@7.2.0) ieee754: 1.2.1 - ignore: 7.0.5 + ignore: 7.0.12 inherits: 2.0.4 - is-docker: 3.0.0 is-fullwidth-code-point: 3.0.0 - is-inside-container: 1.0.0 is-interactive: 1.0.0 is-unicode-supported: 0.1.0 - is-wsl: 3.1.0 isexe: 2.0.0 json5: 2.2.3 jsonc-parser: 3.3.1 lines-and-columns: 2.0.3 log-symbols: 4.1.0 - math-intrinsics: 1.1.0 - mime-db: 1.52.0 - mime-types: 2.1.35 mimic-fn: 2.1.0 minimatch: 10.2.5 minimist: 1.2.8 - ms: 2.1.3 npm-run-path: 4.0.1 once: 1.4.0 onetime: 5.1.2 - open: 10.1.0 ora: 5.4.1 path-key: 3.1.1 picocolors: 1.1.1 - proxy-from-env: 2.1.0 readable-stream: 3.6.2 require-directory: 2.1.1 resolve.exports: 2.0.3 restore-cursor: 3.1.0 - run-applescript: 7.0.0 safe-buffer: 5.2.1 - semver: 7.8.4 + semver: 7.8.5 signal-exit: 3.0.7 sisteransi: 1.0.5 - smol-toml: 1.6.1 + smol-toml: 1.9.0 string-width: 4.2.3 string_decoder: 1.3.0 strip-ansi: 6.0.1 @@ -43207,6 +41421,7 @@ snapshots: tmp: 0.2.7 tsconfig-paths: 4.2.0 tslib: 2.8.1 + undici: 7.29.0 util-deprecate: 1.0.2 wcwidth: 1.0.1 which: 3.0.1 @@ -43217,17 +41432,17 @@ snapshots: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@nx/nx-darwin-arm64': 23.2.0 - '@nx/nx-darwin-x64': 23.2.0 - '@nx/nx-freebsd-x64': 23.2.0 - '@nx/nx-linux-arm-gnueabihf': 23.2.0 - '@nx/nx-linux-arm64-gnu': 23.2.0 - '@nx/nx-linux-arm64-musl': 23.2.0 - '@nx/nx-linux-x64-gnu': 23.2.0 - '@nx/nx-linux-x64-musl': 23.2.0 - '@nx/nx-win32-arm64-msvc': 23.2.0 - '@nx/nx-win32-x64-msvc': 23.2.0 - '@swc-node/register': 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + '@nx/nx-darwin-arm64': 24.0.0 + '@nx/nx-darwin-x64': 24.0.0 + '@nx/nx-freebsd-x64': 24.0.0 + '@nx/nx-linux-arm-gnueabihf': 24.0.0 + '@nx/nx-linux-arm64-gnu': 24.0.0 + '@nx/nx-linux-arm64-musl': 24.0.0 + '@nx/nx-linux-x64-gnu': 24.0.0 + '@nx/nx-linux-x64-musl': 24.0.0 + '@nx/nx-win32-arm64-msvc': 24.0.0 + '@nx/nx-win32-x64-msvc': 24.0.0 + '@swc-node/register': 1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@10.2.2) '@swc/core': 1.15.33(@swc/helpers@0.5.23) nypm@0.6.0: @@ -43262,11 +41477,12 @@ snapshots: obuf@1.1.2: {} - obug@2.1.1: {} + obug@2.1.1: + optional: true - ocache@0.1.2: - dependencies: - ohash: 2.0.11 + obug@3.0.0: {} + + ocache@0.3.0: {} ofetch@1.5.1: dependencies: @@ -43274,8 +41490,6 @@ snapshots: node-fetch-native: 1.6.7 ufo: 1.6.4 - ofetch@2.0.0-alpha.3: {} - ohash@2.0.11: {} on-exit-leak-free@2.1.2: {} @@ -43313,15 +41527,6 @@ snapshots: is-inside-container: 1.0.0 is-wsl: 3.1.0 - open@11.0.0: - dependencies: - default-browser: 5.5.0 - define-lazy-prop: 3.0.0 - is-in-ssh: 1.0.0 - is-inside-container: 1.0.0 - powershell-utils: 0.1.0 - wsl-utils: 0.3.1 - optionator@0.9.4: dependencies: deep-is: 0.1.4 @@ -43347,33 +41552,7 @@ snapshots: outvariant@1.4.3: {} - oxc-minify@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): - optionalDependencies: - '@oxc-minify/binding-android-arm-eabi': 0.110.0 - '@oxc-minify/binding-android-arm64': 0.110.0 - '@oxc-minify/binding-darwin-arm64': 0.110.0 - '@oxc-minify/binding-darwin-x64': 0.110.0 - '@oxc-minify/binding-freebsd-x64': 0.110.0 - '@oxc-minify/binding-linux-arm-gnueabihf': 0.110.0 - '@oxc-minify/binding-linux-arm-musleabihf': 0.110.0 - '@oxc-minify/binding-linux-arm64-gnu': 0.110.0 - '@oxc-minify/binding-linux-arm64-musl': 0.110.0 - '@oxc-minify/binding-linux-ppc64-gnu': 0.110.0 - '@oxc-minify/binding-linux-riscv64-gnu': 0.110.0 - '@oxc-minify/binding-linux-riscv64-musl': 0.110.0 - '@oxc-minify/binding-linux-s390x-gnu': 0.110.0 - '@oxc-minify/binding-linux-x64-gnu': 0.110.0 - '@oxc-minify/binding-linux-x64-musl': 0.110.0 - '@oxc-minify/binding-openharmony-arm64': 0.110.0 - '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - '@oxc-minify/binding-win32-arm64-msvc': 0.110.0 - '@oxc-minify/binding-win32-ia32-msvc': 0.110.0 - '@oxc-minify/binding-win32-x64-msvc': 0.110.0 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - - oxc-resolver@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): + oxc-resolver@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.19.1 '@oxc-resolver/binding-android-arm64': 11.19.1 @@ -43391,7 +41570,7 @@ snapshots: '@oxc-resolver/binding-linux-x64-gnu': 11.19.1 '@oxc-resolver/binding-linux-x64-musl': 11.19.1 '@oxc-resolver/binding-openharmony-arm64': 11.19.1 - '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) '@oxc-resolver/binding-win32-arm64-msvc': 11.19.1 '@oxc-resolver/binding-win32-ia32-msvc': 11.19.1 '@oxc-resolver/binding-win32-x64-msvc': 11.19.1 @@ -43399,32 +41578,6 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-transform@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): - optionalDependencies: - '@oxc-transform/binding-android-arm-eabi': 0.110.0 - '@oxc-transform/binding-android-arm64': 0.110.0 - '@oxc-transform/binding-darwin-arm64': 0.110.0 - '@oxc-transform/binding-darwin-x64': 0.110.0 - '@oxc-transform/binding-freebsd-x64': 0.110.0 - '@oxc-transform/binding-linux-arm-gnueabihf': 0.110.0 - '@oxc-transform/binding-linux-arm-musleabihf': 0.110.0 - '@oxc-transform/binding-linux-arm64-gnu': 0.110.0 - '@oxc-transform/binding-linux-arm64-musl': 0.110.0 - '@oxc-transform/binding-linux-ppc64-gnu': 0.110.0 - '@oxc-transform/binding-linux-riscv64-gnu': 0.110.0 - '@oxc-transform/binding-linux-riscv64-musl': 0.110.0 - '@oxc-transform/binding-linux-s390x-gnu': 0.110.0 - '@oxc-transform/binding-linux-x64-gnu': 0.110.0 - '@oxc-transform/binding-linux-x64-musl': 0.110.0 - '@oxc-transform/binding-openharmony-arm64': 0.110.0 - '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - '@oxc-transform/binding-win32-arm64-msvc': 0.110.0 - '@oxc-transform/binding-win32-ia32-msvc': 0.110.0 - '@oxc-transform/binding-win32-x64-msvc': 0.110.0 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - p-event@6.0.1: dependencies: p-timeout: 6.1.4 @@ -43580,8 +41733,6 @@ snapshots: perfect-debounce@1.0.0: {} - perfect-debounce@2.1.0: {} - pg-gateway@0.3.0-beta.4: {} picocolors@1.1.1: {} @@ -43590,8 +41741,6 @@ snapshots: picomatch@4.0.3: {} - picomatch@4.0.4: {} - picomatch@4.0.7: {} picoquery@2.5.0: {} @@ -43636,12 +41785,6 @@ snapshots: exsolve: 1.1.1 pathe: 2.0.3 - pkg-types@2.3.3: - dependencies: - confbox: 0.3.1 - exsolve: 1.1.1 - pathe: 2.0.3 - pkijs@3.4.0: dependencies: '@noble/hashes': 1.4.0 @@ -43666,7 +41809,7 @@ snapshots: postcss: 8.5.6 semver: 7.7.3 optionalDependencies: - webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) transitivePeerDependencies: - typescript @@ -43703,25 +41846,25 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss-values-parser@6.0.2(postcss@8.5.23): + postcss-values-parser@6.0.2(postcss@8.5.29): dependencies: color-name: 1.1.4 is-url-superb: 4.0.0 - postcss: 8.5.23 + postcss: 8.5.29 quote-unquote: 1.0.0 - postcss@8.5.15: - dependencies: - nanoid: 3.3.12 - picocolors: 1.1.1 - source-map-js: 1.2.1 - postcss@8.5.23: dependencies: nanoid: 3.3.18 picocolors: 1.1.1 source-map-js: 1.2.1 + postcss@8.5.29: + dependencies: + nanoid: 3.3.19 + picocolors: 1.1.1 + source-map-js: 1.2.2 + postcss@8.5.3: dependencies: nanoid: 3.3.11 @@ -43742,8 +41885,6 @@ snapshots: postgres@3.4.7: {} - powershell-utils@0.1.0: {} - pprof-format@2.2.1: {} pprof-to-md@0.1.0: @@ -43767,7 +41908,7 @@ snapshots: detective-amd: 6.0.1 detective-cjs: 6.0.1 detective-es6: 5.0.1 - detective-postcss: 7.0.1(postcss@8.5.23) + detective-postcss: 7.0.1(postcss@8.5.29) detective-sass: 6.0.1 detective-scss: 5.0.1 detective-stylus: 5.0.1 @@ -43775,7 +41916,7 @@ snapshots: detective-vue2: 2.2.0(supports-color@10.2.2)(typescript@5.9.3) module-definition: 6.0.1 node-source-walk: 7.0.1 - postcss: 8.5.23 + postcss: 8.5.29 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -43794,8 +41935,6 @@ snapshots: pretty-bytes@5.6.0: {} - pretty-bytes@7.1.0: {} - pretty-error@4.0.0: dependencies: lodash: 4.17.21 @@ -43807,12 +41946,12 @@ snapshots: ansi-styles: 5.2.0 react-is: 17.0.2 - prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: '@prisma/config': 7.0.0 '@prisma/dev': 0.13.0(@typescript/typescript6@6.0.2) '@prisma/engines': 7.0.0 - '@prisma/studio-core-licensed': 0.8.0(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@prisma/studio-core-licensed': 0.8.0(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) mysql2: 3.15.3 postgres: 3.4.7 optionalDependencies: @@ -43927,60 +42066,60 @@ snapshots: quote-unquote@1.0.0: {} - radix-ui@1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + radix-ui@1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: '@radix-ui/primitive': 1.1.2 - '@radix-ui/react-accessible-icon': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-accordion': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-alert-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-aspect-ratio': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-avatar': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-checkbox': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-context-menu': 2.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-dropdown-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-form': 0.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-hover-card': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-label': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-menubar': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-navigation-menu': 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-popover': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-progress': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-radio-group': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-scroll-area': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-select': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-separator': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slider': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-switch': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-tabs': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toast': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toggle': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toggle-group': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-toolbar': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-tooltip': 1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.3) - '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@radix-ui/react-accessible-icon': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-accordion': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-alert-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-aspect-ratio': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-avatar': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-checkbox': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-context-menu': 2.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-dialog': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-dismissable-layer': 1.1.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-dropdown-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-focus-scope': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-form': 0.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-hover-card': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-label': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-menu': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-menubar': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-navigation-menu': 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-popover': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-popper': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-portal': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-progress': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-radio-group': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-roving-focus': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-scroll-area': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-select': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-separator': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slider': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-slot': 1.2.0(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-switch': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-tabs': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toast': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toggle': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toggle-group': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-toolbar': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-tooltip': 1.2.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.9)(react@19.2.9) + '@radix-ui/react-visually-hidden': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) @@ -44012,22 +42151,17 @@ snapshots: defu: 6.1.4 destr: 2.0.5 - rc9@3.1.0: + react-dom@19.2.9(react@19.2.9): dependencies: - defu: 6.1.7 - destr: 2.0.5 - - react-dom@19.2.3(react@19.2.3): - dependencies: - react: 19.2.3 + react: 19.2.9 scheduler: 0.27.0 - react-hot-toast@2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-hot-toast@2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: csstype: 3.1.3 goober: 2.1.16(csstype@3.1.3) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) react-is@16.13.1: {} @@ -44040,64 +42174,62 @@ snapshots: gl-matrix: 3.4.4 pprof-format: 2.2.1 protobufjs: 7.5.4 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - react-refresh@0.17.0: {} + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) react-refresh@0.18.0: {} - react-remove-scroll-bar@2.3.8(@types/react@19.2.9)(react@19.2.3): + react-remove-scroll-bar@2.3.8(@types/react@19.2.9)(react@19.2.9): dependencies: - react: 19.2.3 - react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.9) tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - react-remove-scroll@2.6.3(@types/react@19.2.9)(react@19.2.3): + react-remove-scroll@2.6.3(@types/react@19.2.9)(react@19.2.9): dependencies: - react: 19.2.3 - react-remove-scroll-bar: 2.3.8(@types/react@19.2.9)(react@19.2.3) - react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.3) + react: 19.2.9 + react-remove-scroll-bar: 2.3.8(@types/react@19.2.9)(react@19.2.9) + react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.9) tslib: 2.8.1 - use-callback-ref: 1.3.3(@types/react@19.2.9)(react@19.2.3) - use-sidecar: 1.1.3(@types/react@19.2.9)(react@19.2.3) + use-callback-ref: 1.3.3(@types/react@19.2.9)(react@19.2.9) + use-sidecar: 1.1.3(@types/react@19.2.9)(react@19.2.9) optionalDependencies: '@types/react': 19.2.9 - react-server-dom-rspack@0.0.2(@rspack/core@2.0.0(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-server-dom-rspack@0.1.1(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: - '@rspack/core': 2.0.0(@swc/helpers@0.5.23) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) - react-style-singleton@2.2.3(@types/react@19.2.9)(react@19.2.3): + react-style-singleton@2.2.3(@types/react@19.2.9)(react@19.2.9): dependencies: get-nonce: 1.0.1 - react: 19.2.3 + react: 19.2.9 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - react-transition-group@4.4.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-transition-group@4.4.5(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: '@babel/runtime': 7.26.7 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) - react-tweet@3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-tweet@3.3.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9): dependencies: '@swc/helpers': 0.5.15 clsx: 2.1.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - swr: 2.3.4(react@19.2.3) + react: 19.2.9 + react-dom: 19.2.9(react@19.2.9) + swr: 2.3.4(react@19.2.9) - react@19.2.3: {} + react@19.2.9: {} read-package-up@11.0.0: dependencies: @@ -44158,10 +42290,6 @@ snapshots: process: 0.11.10 string_decoder: 1.3.0 - readdir-glob@1.1.3: - dependencies: - minimatch: 5.1.9 - readdir-glob@3.0.0: dependencies: minimatch: 10.2.5 @@ -44187,14 +42315,18 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 - redis-errors@1.2.0: {} + redis-errors@1.2.0: + optional: true redis-parser@3.0.0: dependencies: redis-errors: 1.2.0 + optional: true reduce-configs@1.1.1: {} + reduce-configs@2.0.1: {} + reflect-metadata@0.2.2: {} regenerator-runtime@0.14.1: {} @@ -44303,60 +42435,26 @@ snapshots: glob: 13.0.0 package-json-from-dist: 1.0.1 - rolldown@1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): + rolldown@1.2.13: dependencies: - '@oxc-project/types': 0.115.0 - '@rolldown/pluginutils': 1.0.0-rc.9 - optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.0-rc.9 - '@rolldown/binding-darwin-arm64': 1.0.0-rc.9 - '@rolldown/binding-darwin-x64': 1.0.0-rc.9 - '@rolldown/binding-freebsd-x64': 1.0.0-rc.9 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.9 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.9 - '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-x64-musl': 1.0.0-rc.9 - '@rolldown/binding-openharmony-arm64': 1.0.0-rc.9 - '@rolldown/binding-wasm32-wasi': 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.9 - '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.9 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - - rolldown@1.0.2: - dependencies: - '@oxc-project/types': 0.132.0 + '@oxc-project/types': 0.153.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.2 - '@rolldown/binding-darwin-arm64': 1.0.2 - '@rolldown/binding-darwin-x64': 1.0.2 - '@rolldown/binding-freebsd-x64': 1.0.2 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.2 - '@rolldown/binding-linux-arm64-gnu': 1.0.2 - '@rolldown/binding-linux-arm64-musl': 1.0.2 - '@rolldown/binding-linux-ppc64-gnu': 1.0.2 - '@rolldown/binding-linux-s390x-gnu': 1.0.2 - '@rolldown/binding-linux-x64-gnu': 1.0.2 - '@rolldown/binding-linux-x64-musl': 1.0.2 - '@rolldown/binding-openharmony-arm64': 1.0.2 - '@rolldown/binding-wasm32-wasi': 1.0.2 - '@rolldown/binding-win32-arm64-msvc': 1.0.2 - '@rolldown/binding-win32-x64-msvc': 1.0.2 - - rollup-plugin-visualizer@7.1.1(rolldown@1.0.2)(rollup@4.63.1): - dependencies: - open: 11.0.0 - picomatch: 4.0.7 - source-map: 0.8.0 - yargs: 18.1.0 - optionalDependencies: - rolldown: 1.0.2 - rollup: 4.63.1 + '@rolldown/binding-android-arm-eabi': 1.2.13 + '@rolldown/binding-android-arm64': 1.2.13 + '@rolldown/binding-darwin-arm64': 1.2.13 + '@rolldown/binding-darwin-x64': 1.2.13 + '@rolldown/binding-freebsd-x64': 1.2.13 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.13 + '@rolldown/binding-linux-arm64-gnu': 1.2.13 + '@rolldown/binding-linux-arm64-musl': 1.2.13 + '@rolldown/binding-linux-ppc64-gnu': 1.2.13 + '@rolldown/binding-linux-s390x-gnu': 1.2.13 + '@rolldown/binding-linux-x64-gnu': 1.2.13 + '@rolldown/binding-linux-x64-musl': 1.2.13 + '@rolldown/binding-openharmony-arm64': 1.2.13 + '@rolldown/binding-win32-arm64-msvc': 1.2.13 + '@rolldown/binding-win32-x64-msvc': 1.2.13 rollup@4.63.1: dependencies: @@ -44389,10 +42487,11 @@ snapshots: '@rollup/rollup-win32-x64-gnu': 4.63.1 '@rollup/rollup-win32-x64-msvc': 4.63.1 fsevents: 2.3.3 + optional: true rou3@0.7.12: {} - rou3@0.8.1: {} + rou3@0.9.2: {} router@2.2.0(supports-color@10.2.2): dependencies: @@ -44408,17 +42507,31 @@ snapshots: rrweb-cssom@0.8.0: {} - rspack-vue-loader@17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): + rsbuild-plugin-cloudflare@0.0.4(@rsbuild/core@2.3.1)(@types/node@25.0.9)(workerd@1.20261104.1): + dependencies: + '@cloudflare/build-output-utils': 0.9.10 + '@cloudflare/config': 0.30.2 + '@cloudflare/runtime-types': 0.1.23(@types/node@25.0.9) + '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261104.1) + '@rsbuild/core': 2.3.1 + miniflare: 5.20261104.0-beta(@types/node@25.0.9) + unenv: 2.0.0-rc.24 + ws: 8.21.0 + transitivePeerDependencies: + - '@types/node' + - bufferutil + - utf-8-validate + - workerd + + rspack-vue-loader@17.5.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@rspack/lite-tapable': 1.1.0 chalk: 4.1.2 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.3.1(@swc/helpers@0.5.23) '@vue/compiler-sfc': 3.5.25 vue: 3.5.25(@typescript/typescript6@6.0.2) - run-applescript@7.0.0: {} - run-applescript@7.1.0: {} run-parallel@1.2.0: @@ -44455,11 +42568,107 @@ snapshots: safer-buffer@2.1.2: {} + sass-embedded-all-unknown@1.105.1: + dependencies: + sass: 1.105.1 + optional: true + + sass-embedded-android-arm64@1.105.1: + optional: true + + sass-embedded-android-arm@1.105.1: + optional: true + + sass-embedded-android-riscv64@1.105.1: + optional: true + + sass-embedded-android-x64@1.105.1: + optional: true + + sass-embedded-darwin-arm64@1.105.1: + optional: true + + sass-embedded-darwin-x64@1.105.1: + optional: true + + sass-embedded-linux-arm64@1.105.1: + optional: true + + sass-embedded-linux-arm@1.105.1: + optional: true + + sass-embedded-linux-musl-arm64@1.105.1: + optional: true + + sass-embedded-linux-musl-arm@1.105.1: + optional: true + + sass-embedded-linux-musl-riscv64@1.105.1: + optional: true + + sass-embedded-linux-musl-x64@1.105.1: + optional: true + + sass-embedded-linux-riscv64@1.105.1: + optional: true + + sass-embedded-linux-x64@1.105.1: + optional: true + + sass-embedded-unknown-all@1.105.1: + dependencies: + sass: 1.105.1 + optional: true + + sass-embedded-win32-arm64@1.105.1: + optional: true + + sass-embedded-win32-x64@1.105.1: + optional: true + + sass-embedded@1.105.1: + dependencies: + '@bufbuild/protobuf': 2.16.0 + colorjs.io: 0.7.1 + immutable: 5.1.9 + rxjs: 7.8.2 + supports-color: 8.1.1 + sync-child-process: 1.0.2 + varint: 6.0.0 + optionalDependencies: + sass-embedded-all-unknown: 1.105.1 + sass-embedded-android-arm: 1.105.1 + sass-embedded-android-arm64: 1.105.1 + sass-embedded-android-riscv64: 1.105.1 + sass-embedded-android-x64: 1.105.1 + sass-embedded-darwin-arm64: 1.105.1 + sass-embedded-darwin-x64: 1.105.1 + sass-embedded-linux-arm: 1.105.1 + sass-embedded-linux-arm64: 1.105.1 + sass-embedded-linux-musl-arm: 1.105.1 + sass-embedded-linux-musl-arm64: 1.105.1 + sass-embedded-linux-musl-riscv64: 1.105.1 + sass-embedded-linux-musl-x64: 1.105.1 + sass-embedded-linux-riscv64: 1.105.1 + sass-embedded-linux-x64: 1.105.1 + sass-embedded-unknown-all: 1.105.1 + sass-embedded-win32-arm64: 1.105.1 + sass-embedded-win32-x64: 1.105.1 + + sass@1.105.1: + dependencies: + chokidar: 5.0.0 + immutable: 5.1.9 + source-map-js: 1.2.2 + optionalDependencies: + '@parcel/watcher': 2.5.1 + optional: true + sass@1.97.2: dependencies: chokidar: 4.0.3 immutable: 5.1.4 - source-map-js: 1.2.1 + source-map-js: 1.2.2 optionalDependencies: '@parcel/watcher': 2.5.1 @@ -44481,11 +42690,9 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 ajv: 8.18.0 - ajv-formats: 2.1.1(ajv@8.18.0) + ajv-formats: 2.1.1 ajv-keywords: 5.1.0(ajv@8.18.0) - scule@1.3.0: {} - secure-json-parse@4.1.0: {} select-hose@2.0.0: {} @@ -44507,8 +42714,6 @@ snapshots: semver@7.8.2: {} - semver@7.8.4: {} - semver@7.8.5: {} send@0.19.0(supports-color@10.2.2): @@ -44551,8 +42756,6 @@ snapshots: dependencies: randombytes: 2.1.0 - serialize-javascript@7.1.1: {} - seroval-plugins@1.5.4(seroval@1.5.4): dependencies: seroval: 1.5.4 @@ -44577,10 +42780,6 @@ snapshots: transitivePeerDependencies: - supports-color - serve-placeholder@2.0.2: - dependencies: - defu: 6.1.4 - serve-static@1.16.2(supports-color@10.2.2): dependencies: encodeurl: 2.0.0 @@ -44692,6 +42891,39 @@ snapshots: '@types/node': 25.0.9 optional: true + sharp@0.35.5(@types/node@25.0.9): + dependencies: + '@img/colour': 1.1.0 + detect-libc: 2.1.2 + semver: 7.8.5 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.35.5 + '@img/sharp-darwin-x64': 0.35.5 + '@img/sharp-freebsd-wasm32': 0.35.5 + '@img/sharp-libvips-darwin-arm64': 1.3.4 + '@img/sharp-libvips-darwin-x64': 1.3.4 + '@img/sharp-libvips-linux-arm': 1.3.4 + '@img/sharp-libvips-linux-arm64': 1.3.4 + '@img/sharp-libvips-linux-ppc64': 1.3.4 + '@img/sharp-libvips-linux-riscv64': 1.3.4 + '@img/sharp-libvips-linux-s390x': 1.3.4 + '@img/sharp-libvips-linux-x64': 1.3.4 + '@img/sharp-libvips-linuxmusl-arm64': 1.3.4 + '@img/sharp-libvips-linuxmusl-x64': 1.3.4 + '@img/sharp-linux-arm': 0.35.5 + '@img/sharp-linux-arm64': 0.35.5 + '@img/sharp-linux-ppc64': 0.35.5 + '@img/sharp-linux-riscv64': 0.35.5 + '@img/sharp-linux-s390x': 0.35.5 + '@img/sharp-linux-x64': 0.35.5 + '@img/sharp-linuxmusl-arm64': 0.35.5 + '@img/sharp-linuxmusl-x64': 0.35.5 + '@img/sharp-webcontainers-wasm32': 0.35.5 + '@img/sharp-win32-arm64': 0.35.5 + '@img/sharp-win32-ia32': 0.35.5 + '@img/sharp-win32-x64': 0.35.5 + '@types/node': 25.0.9 + shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 @@ -44730,7 +42962,8 @@ snapshots: side-channel-map: 1.0.1 side-channel-weakmap: 1.0.2 - siginfo@2.0.0: {} + siginfo@2.0.0: + optional: true signal-exit@3.0.7: {} @@ -44752,14 +42985,12 @@ snapshots: slash@3.0.0: {} - slash@5.1.0: {} - slashes@3.0.12: {} - smob@1.5.0: {} - smol-toml@1.6.1: {} + smol-toml@1.9.0: {} + sockjs@0.3.24: dependencies: faye-websocket: 0.11.4 @@ -44791,15 +43022,6 @@ snapshots: transitivePeerDependencies: - supports-color - solid-refresh@0.6.3(solid-js@1.9.12)(supports-color@7.2.0): - dependencies: - '@babel/generator': 7.29.8 - '@babel/helper-module-imports': 7.27.1(supports-color@7.2.0) - '@babel/types': 7.29.8 - solid-js: 1.9.12 - transitivePeerDependencies: - - supports-color - solid-refresh@0.7.8(solid-js@1.9.12): dependencies: '@babel/generator': 7.29.8 @@ -44812,6 +43034,8 @@ snapshots: source-map-js@1.2.1: {} + source-map-js@1.2.2: {} + source-map-support@0.5.21: dependencies: buffer-from: 1.1.2 @@ -44823,8 +43047,6 @@ snapshots: source-map@0.7.6: {} - source-map@0.8.0: {} - spawn-command@0.0.2: {} spawndamnit@3.0.1: @@ -44878,17 +43100,9 @@ snapshots: sqlstring@2.3.3: {} - srvx@0.10.0: {} + srvx@1.0.5: {} - srvx@0.10.1: {} - - srvx@0.11.12: {} - - srvx@0.11.15: {} - - srvx@0.11.18: {} - - srvx@0.11.22: {} + srvx@1.0.8: {} stable-hash-x@0.2.0: {} @@ -44896,9 +43110,11 @@ snapshots: stack-trace@1.0.0-pre2: {} - stackback@0.0.2: {} + stackback@0.0.2: + optional: true - standard-as-callback@2.1.0: {} + standard-as-callback@2.1.0: + optional: true standardwebhooks@1.0.0: dependencies: @@ -44920,10 +43136,10 @@ snapshots: std-env@3.9.0: {} - std-env@4.1.0: {} - std-env@4.2.0: {} + std-env@4.3.0: {} + stop-iteration-iterator@1.1.0: dependencies: es-errors: 1.3.0 @@ -44955,17 +43171,6 @@ snapshots: emoji-regex: 9.2.2 strip-ansi: 7.2.0 - string-width@7.2.0: - dependencies: - emoji-regex: 10.6.0 - get-east-asian-width: 1.6.0 - strip-ansi: 7.2.0 - - string-width@8.2.1: - dependencies: - get-east-asian-width: 1.6.0 - strip-ansi: 7.2.0 - string_decoder@1.1.1: dependencies: safe-buffer: 5.1.2 @@ -44992,10 +43197,6 @@ snapshots: strip-json-comments@3.1.1: {} - strip-literal@3.1.0: - dependencies: - js-tokens: 9.0.1 - strip-literal@4.0.0: dependencies: js-tokens: 10.0.0 @@ -45008,16 +43209,16 @@ snapshots: style-loader@4.0.0(webpack@5.97.1): dependencies: - webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) style-to-object@1.0.8: dependencies: inline-style-parser: 0.2.4 - styled-jsx@5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3): + styled-jsx@5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.9): dependencies: client-only: 0.0.1 - react: 19.2.3 + react: 19.2.9 optionalDependencies: '@babel/core': 7.29.7(supports-color@10.2.2) babel-plugin-macros: 3.1.0 @@ -45057,14 +43258,20 @@ snapshots: '@swc/counter': 0.1.3 webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.27.4)(webpack-cli@5.1.4) - swr@2.3.4(react@19.2.3): + swr@2.3.4(react@19.2.9): dependencies: dequal: 2.0.3 - react: 19.2.3 - use-sync-external-store: 1.6.0(react@19.2.3) + react: 19.2.9 + use-sync-external-store: 1.6.0(react@19.2.9) symbol-tree@3.2.4: {} + sync-child-process@1.0.2: + dependencies: + sync-message-port: 1.2.0 + + sync-message-port@1.2.0: {} + tagged-tag@1.0.0: {} tailwind-merge@3.6.0: {} @@ -45134,17 +43341,17 @@ snapshots: '@swc/core': 1.15.33(@swc/helpers@0.5.23) esbuild: 0.27.4 - terser-webpack-plugin@5.3.11(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack@5.97.1): + terser-webpack-plugin@5.3.11(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.97.1): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 schema-utils: 4.3.3 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) - esbuild: 0.28.2 + esbuild: 0.28.1 terser@5.37.0: dependencies: @@ -45186,30 +43393,28 @@ snapshots: timestring@6.0.0: {} - tinybench@2.9.0: {} + tinybench@2.9.0: + optional: true + + tinybench@6.2.2: {} tinyclip@0.1.15: {} tinyexec@0.3.2: {} - tinyexec@1.0.2: {} + tinyexec@1.3.1: {} tinyglobby@0.2.15: dependencies: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 - tinyglobby@0.2.16: - dependencies: - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 - tinyglobby@0.2.17: dependencies: fdir: 6.5.0(picomatch@4.0.7) picomatch: 4.0.7 - tinyrainbow@3.1.0: {} + tinyrainbow@3.2.0: {} tldts-core@6.1.76: {} @@ -45336,7 +43541,7 @@ snapshots: dependencies: tslib: 1.14.1 - turbo-stream@3.2.0: {} + turbo-stream@3.2.1: {} type-check@0.4.0: dependencies: @@ -45348,10 +43553,6 @@ snapshots: type-fest@4.41.0: {} - type-fest@5.4.1: - dependencies: - tagged-tag: 1.0.0 - type-fest@5.9.0: dependencies: tagged-tag: 1.0.0 @@ -45378,13 +43579,13 @@ snapshots: transitivePeerDependencies: - supports-color - typescript-eslint@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0): + typescript-eslint@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - '@typescript-eslint/parser': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@7.2.0) - '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + '@typescript-eslint/eslint-plugin': 8.57.1(@typescript-eslint/parser@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + '@typescript-eslint/parser': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + '@typescript-eslint/typescript-estree': 8.57.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2) + '@typescript-eslint/utils': 8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: - supports-color @@ -45436,17 +43637,8 @@ snapshots: ulid@3.0.1: {} - ultrahtml@1.6.0: {} - uncrypto@0.1.3: {} - unctx@2.5.0: - dependencies: - acorn: 8.15.0 - estree-walker: 3.0.3 - magic-string: 0.30.21 - unplugin: 2.3.11 - undici-types@7.16.0: {} undici-types@7.24.4: {} @@ -45457,6 +43649,10 @@ snapshots: undici@7.27.2: {} + undici@7.29.0: {} + + undici@7.30.1: {} + unenv@2.0.0-rc.24: dependencies: pathe: 2.0.3 @@ -45467,34 +43663,6 @@ snapshots: unicorn-magic@0.4.0: {} - unimport@6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): - dependencies: - acorn: 8.18.0 - escape-string-regexp: 5.0.0 - estree-walker: 3.0.3 - local-pkg: 1.2.1 - magic-string: 1.2.3 - mlly: 1.8.2 - pathe: 2.0.3 - picomatch: 4.0.7 - pkg-types: 2.3.3 - scule: 1.3.0 - strip-literal: 4.0.0 - tinyglobby: 0.2.17 - unplugin: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) - unplugin-utils: 0.3.2 - optionalDependencies: - rolldown: 1.0.2 - transitivePeerDependencies: - - '@farmfe/core' - - '@rspack/core' - - bun-types-no-globals - - esbuild - - rollup - - unloader - - vite - - webpack - universalify@0.1.2: {} universalify@0.2.0: {} @@ -45505,16 +43673,6 @@ snapshots: unpipe@1.0.0: {} - unplugin-utils@0.3.1: - dependencies: - pathe: 2.0.3 - picomatch: 4.0.7 - - unplugin-utils@0.3.2: - dependencies: - pathe: 2.0.3 - picomatch: 4.0.7 - unplugin@1.0.1: dependencies: acorn: 8.15.0 @@ -45529,18 +43687,20 @@ snapshots: picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 - unplugin@3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): + unplugin@3.7.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(esbuild@0.28.1)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): dependencies: '@jridgewell/remapping': 2.3.5 + '@rolldown/pluginutils': 1.0.1 picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) - esbuild: 0.28.2 - rolldown: 1.0.2 + '@rsbuild/core': 2.3.1 + '@rspack/core': 2.3.1(@swc/helpers@0.5.23) + esbuild: 0.28.1 + rolldown: 1.2.13 rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) unrs-resolver@1.11.1: dependencies: @@ -45566,22 +43726,7 @@ snapshots: '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1 '@unrs/resolver-binding-win32-x64-msvc': 1.11.1 - unstorage@1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): - dependencies: - anymatch: 3.1.3 - chokidar: 5.0.0 - destr: 2.0.5 - h3: 1.15.11 - lru-cache: 11.5.1 - node-fetch-native: 1.6.7 - ofetch: 1.5.1 - ufo: 1.6.4 - optionalDependencies: - '@netlify/blobs': 10.1.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - - unstorage@1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + unstorage@1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)): dependencies: anymatch: 3.1.3 chokidar: 5.0.0 @@ -45593,57 +43738,15 @@ snapshots: ufo: 1.6.4 optionalDependencies: '@netlify/blobs': 11.0.3(supports-color@10.2.2) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) + db0: 0.4.1 ioredis: 5.11.1(supports-color@10.2.2) - unstorage@2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 - - unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 - - unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 + unstorage@2.0.0-alpha.10: {} until-async@3.0.2: {} untun@0.2.2: {} - untyped@2.0.0: - dependencies: - citty: 0.1.6 - defu: 6.1.4 - jiti: 2.7.0 - knitwork: 1.3.0 - scule: 1.3.0 - - unwasm@0.5.3: - dependencies: - exsolve: 1.1.1 - knitwork: 1.3.0 - magic-string: 0.30.21 - mlly: 1.8.0 - pathe: 2.0.3 - pkg-types: 2.3.0 - update-browserslist-db@1.1.2(browserslist@4.24.4): dependencies: browserslist: 4.24.4 @@ -45671,24 +43774,24 @@ snapshots: urlpattern-polyfill@8.0.2: {} - use-callback-ref@1.3.3(@types/react@19.2.9)(react@19.2.3): + use-callback-ref@1.3.3(@types/react@19.2.9)(react@19.2.9): dependencies: - react: 19.2.3 + react: 19.2.9 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - use-sidecar@1.1.3(@types/react@19.2.9)(react@19.2.3): + use-sidecar@1.1.3(@types/react@19.2.9)(react@19.2.9): dependencies: detect-node-es: 1.1.0 - react: 19.2.3 + react: 19.2.9 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - use-sync-external-store@1.6.0(react@19.2.3): + use-sync-external-store@1.6.0(react@19.2.9): dependencies: - react: 19.2.3 + react: 19.2.9 util-deprecate@1.0.2: {} @@ -45700,19 +43803,12 @@ snapshots: uuid@10.0.0: {} - uuid@11.1.0: - optional: true - uuid@8.3.2: {} valibot@1.0.0-beta.15(@typescript/typescript6@6.0.2): optionalDependencies: typescript: '@typescript/typescript6@6.0.2' - valibot@1.0.0-beta.15(typescript@7.0.2): - optionalDependencies: - typescript: 7.0.2 - valibot@1.1.0(@typescript/typescript6@6.0.2): optionalDependencies: typescript: '@typescript/typescript6@6.0.2' @@ -45724,9 +43820,11 @@ snapshots: validate-npm-package-name@5.0.1: {} + varint@6.0.0: {} + vary@1.1.2: {} - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45739,13 +43837,13 @@ snapshots: magic-string: 0.30.21 typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45758,13 +43856,32 @@ snapshots: magic-string: 0.30.21 typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) + '@rollup/pluginutils': 5.1.4(rollup@4.63.1) + '@volar/typescript': 2.4.26(@typescript/typescript6@6.0.2) + '@vue/language-core': 2.1.6(@typescript/typescript6@6.0.2) + compare-versions: 6.1.1 + debug: 4.4.3(supports-color@10.2.2) + kolorist: 1.8.0 + local-pkg: 0.5.1 + magic-string: 0.30.21 + typescript: '@typescript/typescript6@6.0.2' + optionalDependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + + vite-plugin-dts@4.2.3(@types/node@25.0.9)(rollup@4.63.1)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45777,21 +43894,25 @@ snapshots: magic-string: 0.30.21 typescript: 5.9.2 optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-externalize-deps@0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-externalize-deps@0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-externalize-deps@0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-externalize-deps@0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-externalize-deps@0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -45799,14 +43920,14 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.12 solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-solid@2.11.10(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -45814,215 +43935,189 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.12 solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: - '@testing-library/jest-dom': 6.6.3 + '@testing-library/jest-dom': 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) transitivePeerDependencies: - supports-color - vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - '@babel/core': 7.29.7(supports-color@7.2.0) + '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@7.2.0))(solid-js@1.9.12) + babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@10.2.2))(solid-js@1.9.12) merge-anything: 5.1.7 solid-js: 1.9.12 - solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@7.2.0) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@babel/core': 7.29.7(supports-color@10.2.2) + '@types/babel__core': 7.20.5 + babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@10.2.2))(solid-js@1.9.12) + merge-anything: 5.1.7 + solid-js: 1.9.12 + solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + optionalDependencies: + '@testing-library/jest-dom': 6.6.3 + transitivePeerDependencies: + - supports-color + + vite-plugin-solid@2.11.11(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4))(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@babel/core': 7.29.7(supports-color@10.2.2) + '@types/babel__core': 7.20.5 + babel-preset-solid: 1.9.10(@babel/core@7.29.7(supports-color@10.2.2))(solid-js@1.9.12) + merge-anything: 5.1.7 + solid-js: 1.9.12 + solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + optionalDependencies: + '@testing-library/jest-dom': 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + transitivePeerDependencies: + - supports-color + + vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + debug: 4.4.3(supports-color@10.2.2) + globrex: 0.1.2 + tsconfck: 3.1.4(@typescript/typescript6@6.0.2) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - supports-color + - typescript + + vite-tsconfig-paths@6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.9.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0): + vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 - postcss: 8.5.15 - rolldown: 1.0.2 - tinyglobby: 0.2.16 + lightningcss: 1.33.0 + picomatch: 4.0.7 + postcss: 8.5.29 + rolldown: 1.2.13 + tinyglobby: 0.2.17 optionalDependencies: '@types/node': 25.0.9 esbuild: 0.27.4 fsevents: 2.3.3 jiti: 2.7.0 sass: 1.97.2 - terser: 5.37.0 - tsx: 4.20.3 - yaml: 2.9.0 - - vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): - dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 - postcss: 8.5.15 - rolldown: 1.0.2 - tinyglobby: 0.2.16 - optionalDependencies: - '@types/node': 25.0.9 - esbuild: 0.28.2 - fsevents: 2.3.3 - jiti: 2.7.0 - sass: 1.97.2 + sass-embedded: 1.105.1 terser: 5.51.2 tsx: 4.20.3 yaml: 2.9.0 - vitefu@1.1.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - - vitefu@1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - - vitefu@1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - why-is-node-running: 2.3.0 + lightningcss: 1.33.0 + picomatch: 4.0.7 + postcss: 8.5.29 + rolldown: 1.2.13 + tinyglobby: 0.2.17 optionalDependencies: - '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 25.0.1(supports-color@10.2.2) - transitivePeerDependencies: - - msw + esbuild: 0.28.1 + fsevents: 2.3.3 + jiti: 2.7.0 + sass: 1.105.1 + sass-embedded: 1.105.1 + terser: 5.51.2 + tsx: 4.20.3 + yaml: 2.9.0 - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - why-is-node-running: 2.3.0 + lightningcss: 1.33.0 + picomatch: 4.0.7 + postcss: 8.5.29 + rolldown: 1.2.13 + tinyglobby: 0.2.17 optionalDependencies: - '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 25.0.1(supports-color@10.2.2) - transitivePeerDependencies: - - msw + esbuild: 0.28.1 + fsevents: 2.3.3 + jiti: 2.7.0 + sass: 1.97.2 + sass-embedded: 1.105.1 + terser: 5.51.2 + tsx: 4.20.3 + yaml: 2.9.0 - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) - why-is-node-running: 2.3.0 + vitefu@1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): optionalDependencies: - '@opentelemetry/api': 1.9.1 - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 27.0.0(supports-color@10.2.2) - transitivePeerDependencies: - - msw + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)): + vitefu@1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + optionalDependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + vitefu@1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + optionalDependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + vitefu@1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + optionalDependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 '@vitest/spy': 4.1.4 '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 magic-string: 0.30.21 obug: 2.1.1 pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 + picomatch: 4.0.7 + std-env: 4.3.0 tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + tinyrainbow: 3.2.0 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -46031,33 +44126,148 @@ snapshots: jsdom: 29.1.1(@noble/hashes@2.0.1) transitivePeerDependencies: - msw + optional: true - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - why-is-node-running: 2.3.0 + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 optionalDependencies: '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) + '@vitest/ui': 5.0.4(vitest@5.0.4) + jsdom: 25.0.1(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 5.0.4(vitest@5.0.4) + jsdom: 25.0.1(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 5.0.4(vitest@5.0.4) + jsdom: 25.0.1(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 5.0.4(vitest@5.0.4) + jsdom: 27.0.0(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 5.0.4(vitest@5.0.4) + jsdom: 29.1.1(@noble/hashes@2.0.1) + transitivePeerDependencies: + - msw + + vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@5.0.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@types/chai': 5.2.2 + '@vitest/mocker': 5.0.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + chai: 6.3.0 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 + magic-string: 1.4.3 + obug: 3.0.0 + picomatch: 4.0.7 + std-env: 4.3.0 + tinybench: 6.2.2 + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 3.2.1 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 5.0.4(vitest@5.0.4) jsdom: 29.1.1(@noble/hashes@2.0.1) transitivePeerDependencies: - msw @@ -46074,9 +44284,9 @@ snapshots: dependencies: vue: 3.5.25(typescript@5.8.3) - vue-demi@0.14.10(vue@3.5.25(typescript@7.0.2)): + vue-demi@0.14.10(vue@3.5.25(typescript@6.0.2)): dependencies: - vue: 3.5.25(typescript@7.0.2) + vue: 3.5.25(typescript@6.0.2) vue-eslint-parser@10.2.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): dependencies: @@ -46086,19 +44296,19 @@ snapshots: eslint-visitor-keys: 4.2.1 espree: 10.4.0 esquery: 1.6.0 - semver: 7.8.2 + semver: 7.8.5 transitivePeerDependencies: - supports-color - vue-eslint-parser@10.4.0(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0): + vue-eslint-parser@10.4.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2): dependencies: - debug: 4.4.3(supports-color@7.2.0) - eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) + debug: 4.4.3(supports-color@10.2.2) + eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) eslint-scope: 8.3.0 eslint-visitor-keys: 4.2.1 espree: 10.4.0 esquery: 1.6.0 - semver: 7.8.2 + semver: 7.8.5 transitivePeerDependencies: - supports-color @@ -46163,15 +44373,15 @@ snapshots: optionalDependencies: typescript: 5.9.3 - vue@3.5.25(typescript@7.0.2): + vue@3.5.25(typescript@6.0.2): dependencies: '@vue/compiler-dom': 3.5.25 '@vue/compiler-sfc': 3.5.25 '@vue/runtime-dom': 3.5.25 - '@vue/server-renderer': 3.5.25(vue@3.5.25(typescript@7.0.2)) + '@vue/server-renderer': 3.5.25(vue@3.5.25(typescript@6.0.2)) '@vue/shared': 3.5.25 optionalDependencies: - typescript: 7.0.2 + typescript: 6.0.2 w3c-xmlserializer@5.0.0: dependencies: @@ -46220,10 +44430,10 @@ snapshots: import-local: 3.2.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: - webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) + webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) optional: true webpack-cli@5.1.4(webpack-dev-server@5.2.4)(webpack@5.97.1): @@ -46243,7 +44453,7 @@ snapshots: webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.27.4)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: - webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) + webpack-dev-server: 5.2.4(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1) webpack-dev-middleware@7.4.2(webpack@5.110.3): dependencies: @@ -46254,7 +44464,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.3 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optional: true webpack-dev-middleware@7.4.2(webpack@5.97.1): @@ -46268,7 +44478,7 @@ snapshots: optionalDependencies: webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.27.4)(webpack-cli@5.1.4) - webpack-dev-server@5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3): + webpack-dev-server@5.2.4(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -46286,7 +44496,7 @@ snapshots: connect-history-api-fallback: 2.0.0 express: 4.22.2(supports-color@10.2.2) graceful-fs: 4.2.11 - http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@7.2.0)) + http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@10.2.2)) ipaddr.js: 2.2.0 launch-editor: 2.9.1 open: 10.1.0 @@ -46299,7 +44509,7 @@ snapshots: webpack-dev-middleware: 7.4.2(webpack@5.110.3) ws: 8.20.0 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) transitivePeerDependencies: - bufferutil @@ -46308,7 +44518,7 @@ snapshots: - utf-8-validate optional: true - webpack-dev-server@5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1): + webpack-dev-server@5.2.4(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -46326,7 +44536,46 @@ snapshots: connect-history-api-fallback: 2.0.0 express: 4.22.2(supports-color@10.2.2) graceful-fs: 4.2.11 - http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@7.2.0)) + http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@10.2.2)) + ipaddr.js: 2.2.0 + launch-editor: 2.9.1 + open: 10.1.0 + p-retry: 6.2.1 + schema-utils: 4.3.3 + selfsigned: 5.5.0 + serve-index: 1.9.1(supports-color@10.2.2) + sockjs: 0.3.24 + spdy: 4.0.2(supports-color@10.2.2) + webpack-dev-middleware: 7.4.2(webpack@5.97.1) + ws: 8.20.0 + optionalDependencies: + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.97.1) + transitivePeerDependencies: + - bufferutil + - debug + - supports-color + - utf-8-validate + + webpack-dev-server@5.2.4(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.97.1): + dependencies: + '@types/bonjour': 3.5.13 + '@types/connect-history-api-fallback': 1.5.4 + '@types/express': 4.17.25 + '@types/express-serve-static-core': 4.19.6 + '@types/serve-index': 1.9.4 + '@types/serve-static': 1.15.7 + '@types/sockjs': 0.3.36 + '@types/ws': 8.5.14 + ansi-html-community: 0.0.8 + bonjour-service: 1.3.0 + chokidar: 3.6.0 + colorette: 2.0.20 + compression: 1.8.1(supports-color@10.2.2) + connect-history-api-fallback: 2.0.0 + express: 4.22.2(supports-color@10.2.2) + graceful-fs: 4.2.11 + http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@10.2.2)) ipaddr.js: 2.2.0 launch-editor: 2.9.1 open: 10.1.0 @@ -46363,7 +44612,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4): + webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4): dependencies: '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 @@ -46374,11 +44623,11 @@ snapshots: browserslist: 4.28.1 chrome-trace-event: 1.0.4 enhanced-resolve: 5.24.5 - es-module-lexer: 2.3.1 + es-module-lexer: 2.3.2 events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3) + minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.1)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.5(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3) neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.3 @@ -46436,7 +44685,7 @@ snapshots: - esbuild - uglify-js - webpack@5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4): + webpack@5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -46458,7 +44707,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack@5.97.1) + terser-webpack-plugin: 5.3.11(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.97.1) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: @@ -46546,6 +44795,9 @@ snapshots: dependencies: siginfo: 2.0.0 stackback: 0.0.2 + optional: true + + why-is-node-running@3.2.1: {} wildcard@2.0.1: {} @@ -46579,6 +44831,14 @@ snapshots: '@cloudflare/workerd-linux-arm64': 1.20260317.1 '@cloudflare/workerd-windows-64': 1.20260317.1 + workerd@1.20261104.1: + optionalDependencies: + '@cloudflare/workerd-darwin-64': 1.20261104.1 + '@cloudflare/workerd-darwin-arm64': 1.20261104.1 + '@cloudflare/workerd-linux-64': 1.20261104.1 + '@cloudflare/workerd-linux-arm64': 1.20261104.1 + '@cloudflare/workerd-windows-64': 1.20261104.1 + wrangler@4.75.0: dependencies: '@cloudflare/kv-asset-handler': 0.4.2 @@ -46613,28 +44873,13 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.2.0 - wrap-ansi@9.0.2: - dependencies: - ansi-styles: 6.2.3 - string-width: 7.2.0 - strip-ansi: 7.2.0 - wrappy@1.0.2: {} - write-file-atomic@5.0.1: - dependencies: - imurmurhash: 0.1.4 - signal-exit: 4.1.0 - optional: true - ws@8.18.0: {} ws@8.20.0: {} - wsl-utils@0.3.1: - dependencies: - is-wsl: 3.1.1 - powershell-utils: 0.1.0 + ws@8.21.0: {} xml-name-validator@4.0.0: {} @@ -46670,8 +44915,6 @@ snapshots: yargs-parser@21.1.1: {} - yargs-parser@22.0.0: {} - yargs@16.2.0: dependencies: cliui: 7.0.4 @@ -46692,15 +44935,6 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 - yargs@18.1.0: - dependencies: - cliui: 9.0.1 - escalade: 3.2.0 - get-caller-file: 2.0.5 - string-width: 8.2.1 - y18n: 5.0.8 - yargs-parser: 22.0.0 - yauzl@3.4.0: dependencies: pend: 1.2.0 @@ -46724,24 +44958,10 @@ snapshots: cookie: 1.1.1 youch-core: 0.3.3 - youch@4.1.1: - dependencies: - '@poppinss/colors': 4.1.6 - '@poppinss/dumper': 0.7.0 - '@speed-highlight/core': 1.2.14 - cookie-es: 3.1.1 - youch-core: 0.3.3 - zeptomatch@2.0.2: dependencies: grammex: 3.1.11 - zip-stream@6.0.1: - dependencies: - archiver-utils: 5.0.2 - compress-commons: 6.0.2 - readable-stream: 4.7.0 - zip-stream@7.0.5: dependencies: compress-commons: 7.0.1 @@ -46756,9 +44976,11 @@ snapshots: zod@4.5.4: {} - zustand@5.0.12(@types/react@19.2.9)(immer@10.1.1)(react@19.2.3)(use-sync-external-store@1.6.0(react@19.2.3)): + zod@4.6.6: {} + + zustand@5.0.12(@types/react@19.2.9)(immer@10.1.1)(react@19.2.9)(use-sync-external-store@1.6.0(react@19.2.9)): optionalDependencies: '@types/react': 19.2.9 immer: 10.1.1 - react: 19.2.3 - use-sync-external-store: 1.6.0(react@19.2.3) + react: 19.2.9 + use-sync-external-store: 1.6.0(react@19.2.9) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 89a2478792..c5c9bae1df 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -36,15 +36,15 @@ catalog: '@babel/types': ^7.29.8 '@arethetypeswrong/cli': ^0.18.4 '@eslint-react/eslint-plugin': ^1.26.2 - '@rsbuild/core': ^2.2.5 + '@rsbuild/core': ^2.3.1 '@tanstack/vite-config': 0.5.2 - '@testing-library/jest-dom': ^6.6.3 + '@testing-library/jest-dom': ^7.0.1 '@testing-library/react': ^16.2.0 - '@vitejs/plugin-react': ^4.3.4 + '@vitejs/plugin-react': ^6.0.1 '@vitejs/plugin-vue-jsx': ^4.1.2 - '@vitest/ui': ^4.1.4 - react: ^19.2.3 - react-dom: ^19.2.3 + '@vitest/ui': ^5.0.4 + react: ~19.2.9 + react-dom: ~19.2.9 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 eslint: ^9.22.0 @@ -59,9 +59,9 @@ catalog: rimraf: ^6.1.2 solid-js: 1.9.12 tinyglobby: ^0.2.17 - vite: ^8.0.14 + vite: ^8.3.4 vite-plugin-solid: 2.11.10 - vitest: ^4.1.4 + vitest: ^5.0.4 vue: ^3.5.25 zod: ^4.5.4 '@types/node': 25.0.9 @@ -125,7 +125,6 @@ overrides: '@tanstack/eslint-plugin-router': 'workspace:*' '@tanstack/router-utils': 'workspace:*' '@tanstack/start-static-server-functions': 'workspace:*' - '@tanstack/nitro-v2-vite-plugin': 'workspace:*' allowBuilds: # root dependency diff --git a/scripts/benchmarks/bundle-size/build.mjs b/scripts/benchmarks/bundle-size/build.mjs index df48d53e5c..dfb32c923a 100644 --- a/scripts/benchmarks/bundle-size/build.mjs +++ b/scripts/benchmarks/bundle-size/build.mjs @@ -10,22 +10,11 @@ const repoRoot = fileURLToPath(new URL('../../../', import.meta.url)) * @param {import('./run.mjs').Execute} [execute] */ export function build(args, execute = spawnSync) { - const pnpmPath = process.env.npm_execpath /** @type {import('./run.mjs').CommandOptions} */ const options = { cwd: repoRoot, env: process.env, stdio: 'inherit' } const result = execute( - pnpmPath - ? process.execPath - : process.platform === 'win32' - ? 'pnpm.cmd' - : 'pnpm', - [ - ...(pnpmPath ? [pnpmPath] : []), - 'nx', - 'run', - '@benchmarks/bundle-size:build', - ...args, - ], + process.env.npm_execpath || 'pnpm', + ['exec', 'nx', 'run', '@benchmarks/bundle-size:measure', ...args], options, ) if (result.status !== 0) { diff --git a/scripts/benchmarks/bundle-size/build.test.mjs b/scripts/benchmarks/bundle-size/build.test.mjs index 48717e8b17..779824c35a 100644 --- a/scripts/benchmarks/bundle-size/build.test.mjs +++ b/scripts/benchmarks/bundle-size/build.test.mjs @@ -17,10 +17,11 @@ test('generates a fresh report after a successful Nx run, including cache hits', ) assert.equal(status, 0) assert.equal(calls.length, 2) - assert.deepEqual(calls[0]?.slice(-5), [ + assert.deepEqual(calls[0], [ + 'exec', 'nx', 'run', - '@benchmarks/bundle-size:build', + '@benchmarks/bundle-size:measure', '--outputStyle=stream', '--skipRemoteCache', ]) diff --git a/scripts/benchmarks/bundle-size/measure.mjs b/scripts/benchmarks/bundle-size/measure.mjs index 73631eb90b..4a990feaf9 100644 --- a/scripts/benchmarks/bundle-size/measure.mjs +++ b/scripts/benchmarks/bundle-size/measure.mjs @@ -479,6 +479,7 @@ function buildRequiredPackages({ repoRoot, scenarios, skipPackageBuilds }) { ) const args = [ + 'exec', 'nx', 'run-many', '--target=build', @@ -494,7 +495,7 @@ function buildRequiredPackages({ repoRoot, scenarios, skipPackageBuilds }) { args.push('--skipNxCache') } - execFileSync(process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm', args, { + execFileSync(process.env.npm_execpath || 'pnpm', args, { cwd: repoRoot, stdio: 'inherit', env: process.env, diff --git a/scripts/benchmarks/bundle-size/run.mjs b/scripts/benchmarks/bundle-size/run.mjs index 2e6d42c977..a4a0cc73d2 100644 --- a/scripts/benchmarks/bundle-size/run.mjs +++ b/scripts/benchmarks/bundle-size/run.mjs @@ -180,26 +180,17 @@ Arguments after -- go to the selected unit tests, not the measurement.`) } if (values['test-projects']) { - const pnpmPath = process.env.npm_execpath - const status = step( - 'tests', - pnpmPath - ? process.execPath - : process.platform === 'win32' - ? 'pnpm.cmd' - : 'pnpm', - [ - ...(pnpmPath ? [pnpmPath] : []), - 'nx', - 'run-many', - '--target=test:unit', - `--projects=${values['test-projects']}`, - '--parallel=1', - '--outputStyle=stream', - '--skipRemoteCache', - ...(testArgs.length > 0 ? ['--', ...testArgs] : []), - ], - ) + const status = step('tests', process.env.npm_execpath || 'pnpm', [ + 'exec', + 'nx', + 'run-many', + '--target=test:unit', + `--projects=${values['test-projects']}`, + '--parallel=1', + '--outputStyle=stream', + '--skipRemoteCache', + ...(testArgs.length > 0 ? ['--', ...testArgs] : []), + ]) if (status !== 0) { return status } diff --git a/skills/bundle-size-optimization/SKILL.md b/skills/bundle-size-optimization/SKILL.md index 34f7494efe..1b6b5ebe3a 100644 --- a/skills/bundle-size-optimization/SKILL.md +++ b/skills/bundle-size-optimization/SKILL.md @@ -7,7 +7,7 @@ description: Use when working in this repository on JS bundle size, gzip regress ## Overview -Optimize measured client bundles, not source text. The source of truth is `@benchmarks/bundle-size:build`, `benchmarks/bundle-size/results/current.json`, and emitted JS in `benchmarks/bundle-size/dist/`. +Optimize measured client bundles, not source text. The source of truth is `@benchmarks/bundle-size:measure`, `benchmarks/bundle-size/results/current.json`, and emitted JS in `benchmarks/bundle-size/dist/`. Use `benchmark:bundle-size:run` for local iterations. It uses the same measurement script and builds the selected packages through Nx. ## Commands